From 19fbe80c3d1f3b5888a3f78f2df2af07355ea498 Mon Sep 17 00:00:00 2001
From: John Ericson <jericson@galois.com>
Date: Thu, 15 Dec 2016 17:09:46 -0500
Subject: [PATCH] top-level: avoid another `assert false` while we're at it

---
 pkgs/stdenv/darwin/make-bootstrap-tools.nix | 2 +-
 pkgs/top-level/default.nix                  | 4 ++--
 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 bd581f71a436..c862eb141a8c 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 31c51215676b..658f149908c7 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;
   };