public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

top-level: avoid another assert false while we're at it

Browse Source
This commit is contained in:
John Ericson 2016-12-15 17:09:46 -05:00
parent 7960a1b1b8
commit 19fbe80c3d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/stdenv/darwin/make-bootstrap-tools.nix
View File

@ -334,7 +334,7 @@ in rec {
# The ultimate test: bootstrap a whole stdenv from the tools specified above and get a package set out of it # The ultimate test: bootstrap a whole stdenv from the tools specified above and get a package set out of it
test-pkgs = import test-pkgspath { test-pkgs = import test-pkgspath {
inherit system; inherit system;
stdenv = args: let stdenvFunc = args: let
args' = args // { inherit bootstrapFiles; }; args' = args // { inherit bootstrapFiles; };
in (import (test-pkgspath + "/pkgs/stdenv/darwin") args').stdenvDarwin; in (import (test-pkgspath + "/pkgs/stdenv/darwin") args').stdenvDarwin;
}; };

4
pkgs/top-level/default.nix
View File

@ -25,7 +25,7 @@
, # The standard environment for building packages, or rather a function , # The standard environment for building packages, or rather a function
# providing it. See below for the arguments given to that function. # providing it. See below for the arguments given to that function.
stdenv ? assert false; null stdenvFunc ? import ../stdenv
, crossSystem ? null , crossSystem ? null
, platform ? assert false; null , platform ? assert false; null
@ -76,7 +76,7 @@ in let
inherit lib nixpkgsFun; inherit lib nixpkgsFun;
} // newArgs); } // newArgs);
stdenv = (args.stdenv or (import ../stdenv)) { stdenv = stdenvFunc {
inherit lib allPackages system platform crossSystem config; inherit lib allPackages system platform crossSystem config;
}; };