mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 23:36:17 +01:00
Filter null elements from dependency lists to keep hashes stable.
svn path=/nixpkgs/trunk/; revision=28434
This commit is contained in:
parent
369832838b
commit
31654fc153
1 changed files with 10 additions and 1 deletions
|
@ -11,6 +11,15 @@
|
|||
"isLibrary" "isExecutable"
|
||||
];
|
||||
|
||||
# Stuff happening after the user preferences have been processed. We remove
|
||||
# internal attributes and strip null elements from the dependency lists, all
|
||||
# in the interest of keeping hashes stable.
|
||||
postprocess =
|
||||
x : (removeAttrs x internalAttrs) // {
|
||||
buildInputs = stdenv.lib.filter (y : ! (y == null)) x.buildInputs;
|
||||
propagatedBuildInputs = stdenv.lib.filter (y : ! (y == null)) x.propagatedBuildInputs;
|
||||
};
|
||||
|
||||
defaults =
|
||||
self : { # self is the final version of the attribute set
|
||||
|
||||
|
@ -142,5 +151,5 @@
|
|||
# in Cabal derivations.
|
||||
inherit stdenv ghc;
|
||||
};
|
||||
in stdenv.mkDerivation (removeAttrs ((rec { f = defaults f // args f; }).f) internalAttrs) ;
|
||||
in stdenv.mkDerivation (postprocess ((rec { f = defaults f // args f; }).f)) ;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue