about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJohn Ericson <jericson@galois.com>2016-12-15 17:09:46 -0500
committerJohn Ericson <jericson@galois.com>2016-12-15 17:09:46 -0500
commit19fbe80c3d1f3b5888a3f78f2df2af07355ea498 (patch)
treef7b4257bc240ccee441e358709a833e102b7e0ba /pkgs
parent7960a1b1b8fa1ca097bee2971fbbc18bda3dcadd (diff)
top-level: avoid another `assert false` while we're at it
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/stdenv/darwin/make-bootstrap-tools.nix2
-rw-r--r--pkgs/top-level/default.nix4
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index bd581f71a436a..c862eb141a8c5 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -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
   test-pkgs = import test-pkgspath {
     inherit system;
-    stdenv = args: let
+    stdenvFunc = args: let
         args' = args // { inherit bootstrapFiles; };
       in (import (test-pkgspath + "/pkgs/stdenv/darwin") args').stdenvDarwin;
   };
diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix
index 31c51215676b1..658f149908c76 100644
--- a/pkgs/top-level/default.nix
+++ b/pkgs/top-level/default.nix
@@ -25,7 +25,7 @@
 
 , # The standard environment for building packages, or rather a function
   # providing it. See below for the arguments given to that function.
-  stdenv ? assert false; null
+  stdenvFunc ? import ../stdenv
 
 , crossSystem ? null
 , platform ? assert false; null
@@ -76,7 +76,7 @@ in let
     inherit lib nixpkgsFun;
   } // newArgs);
 
-  stdenv = (args.stdenv or (import ../stdenv)) {
+  stdenv = stdenvFunc {
     inherit lib allPackages system platform crossSystem config;
   };