···

       
39
       
39
       
 
       
  vmWithBootLoader = vmWithBootLoaderConfig.system.build.vm;

     

       
40
       
40
       
 
       


     

       
41
       
41
       
 
       
  # The following are used by nixos-rebuild.

     

       
42
       
42
       
-
       
  nixFallback = pkgs.nixUnstable;

     

       
42
       
42
       
+
       
  nixFallback = pkgs.nixUnstable.out;

     

       
43
       
43
       
 
       
}

     

···

       
65
       
65
       
 
       


     

       
66
       
66
       
 
       
      package = mkOption {

     

       
67
       
67
       
 
       
        type = types.package;

     

       
68
       
68
       
-
       
        default = pkgs.nix;

     

       
69
       
69
       
-
       
        defaultText = "pkgs.nix";

     

       
68
       
68
       
+
       
        default = pkgs.nix.out;

     

       
69
       
69
       
+
       
        defaultText = "pkgs.nix.out";

     

       
70
       
70
       
 
       
        description = ''

     

       
71
       
71
       
 
       
          This option specifies the Nix package instance to use throughout the system.

     

       
72
       
72
       
 
       
        '';

     

···

       
61
       
61
       
 
       
  drvName = drv:

     

       
62
       
62
       
 
       
    discard (substring 33 (stringLength (builtins.baseNameOf drv)) (builtins.baseNameOf drv));

     

       
63
       
63
       
 
       


     

       
64
       
64
       
-
       
  rewriteHashes = drv: hashes: runCommand (drvName drv) { nixStore = "${nix}/bin/nix-store"; } ''

     

       
64
       
64
       
+
       
  rewriteHashes = drv: hashes: runCommand (drvName drv) { nixStore = "${nix.out}/bin/nix-store"; } ''

     

       
65
       
65
       
 
       
    $nixStore --dump ${drv} | sed 's|${baseNameOf drv}|'$(basename $out)'|g' | sed -e ${

     

       
66
       
66
       
 
       
      concatStringsSep " -e " (mapAttrsToList (name: value:

     

       
67
       
67
       
 
       
        "'s|${baseNameOf name}|${baseNameOf value}|g'"

     

···

       
15
       
15
       
 
       
    substituteInPlace $GEM_HOME/gems/${gemName}-${version}/lib/bundix.rb \

     

       
16
       
16
       
 
       
      --replace \

     

       
17
       
17
       
 
       
        "'nix-instantiate'" \

     

       
18
       
18
       
-
       
        "'${nix}/bin/nix-instantiate'" \

     

       
18
       
18
       
+
       
        "'${nix.out}/bin/nix-instantiate'" \

     

       
19
       
19
       
 
       
      --replace \

     

       
20
       
20
       
 
       
        "'nix-hash'" \

     

       
21
       
21
       
-
       
        "'${nix}/bin/nix-hash'" \

     

       
21
       
21
       
+
       
        "'${nix.out}/bin/nix-hash'" \

     

       
22
       
22
       
 
       
      --replace \

     

       
23
       
23
       
 
       
        "'nix-prefetch-url'" \

     

       
24
       
24
       
-
       
        "'${nix}/bin/nix-prefetch-url'" \

     

       
24
       
24
       
+
       
        "'${nix.out}/bin/nix-prefetch-url'" \

     

       
25
       
25
       
 
       
      --replace \

     

       
26
       
26
       
 
       
        "'nix-prefetch-git'" \

     

       
27
       
27
       
 
       
        "'${nix-prefetch-git}/bin/nix-prefetch-git'"

     

···

       
9
       
9
       
 
       
  common = { name, src }: stdenv.mkDerivation rec {

     

       
10
       
10
       
 
       
    inherit name src;

     

       
11
       
11
       
 
       


     

       
12
       
12
       
-
       
    outputs = [ "out" "man" "doc" ];

     

       
12
       
12
       
+
       
    outputs = [ "dev" "out" "man" "doc" ];

     

       
13
       
13
       
 
       


     

       
14
       
14
       
 
       
    nativeBuildInputs = [ perl pkgconfig ];

     

       
15
       
15