stdenv: Fix __ignoreNulls
Commit 262c21ed46 purported to enable
ignoreNulls, but it was bogus because it set the flag on the wrong
derivation (i.e. stdenv rather than the result of mkDerivation).
This commit is contained in:
@@ -55,8 +55,6 @@ let
|
||||
|
||||
propagatedUserEnvPkgs = [gcc] ++
|
||||
lib.filter lib.isDerivation initialPath;
|
||||
|
||||
__ignoreNulls = true;
|
||||
}
|
||||
|
||||
// rec {
|
||||
@@ -103,6 +101,7 @@ let
|
||||
stdenv = result;
|
||||
system = result.system;
|
||||
userHook = config.stdenv.userHook or null;
|
||||
__ignoreNulls = true;
|
||||
|
||||
# Inputs built by the cross compiler.
|
||||
buildInputs = lib.optionals (crossConfig != null) (buildInputs ++ extraBuildInputs);
|
||||
|
||||
Reference in New Issue
Block a user