diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-01 16:55:14 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-01 16:56:36 +0200 |
| commit | 0da7fadce32289e926415629a697028aa7296b96 (patch) | |
| tree | b42c1faf7917510418a0e3138776bf1a05481672 /pkgs/stdenv | |
| parent | f46108aaf020173ec4fdf532d4c2cf26eabeb2a6 (diff) | |
stdenv: Fix __ignoreNulls
Commit 262c21ed464a2593b54ec274a3b84083c0795f2d 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).
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 6047ecf853c5e..0d8355e89cc38 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -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); |