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

stdenv: Fix __ignoreNulls

Browse Source 
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).
This commit is contained in:
Eelco Dolstra 2014-07-01 16:55:14 +02:00
parent f46108aaf0
commit 0da7fadce3
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/stdenv/generic/default.nix
View File

@ -55,8 +55,6 @@ let
propagatedUserEnvPkgs = [gcc] ++ propagatedUserEnvPkgs = [gcc] ++
lib.filter lib.isDerivation initialPath; lib.filter lib.isDerivation initialPath;
__ignoreNulls = true;
} }
// rec { // rec {
@ -103,6 +101,7 @@ let
stdenv = result; stdenv = result;
system = result.system; system = result.system;
userHook = config.stdenv.userHook or null; userHook = config.stdenv.userHook or null;
__ignoreNulls = true;
# Inputs built by the cross compiler. # Inputs built by the cross compiler.
buildInputs = lib.optionals (crossConfig != null) (buildInputs ++ extraBuildInputs); buildInputs = lib.optionals (crossConfig != null) (buildInputs ++ extraBuildInputs);