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

* Handle the attributes added by the multiple outputs branch.

Browse Source 
svn path=/nixpkgs/trunk/; revision=31278
This commit is contained in:
Eelco Dolstra 2012-01-04 15:06:21 +00:00
parent 0348f11e22
commit 7fcf771c2a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/lib/customisation.nix
View File

@ -34,7 +34,7 @@ rec {
overrideDerivation = drv: f: overrideDerivation = drv: f:
let let
# Filter out special attributes. # Filter out special attributes.
drop = ["meta" "passthru" "outPath" "drvPath" "hostDrv" "buildDrv" "type" "override" "deepOverride" "origArgs"] drop = [ "meta" "passthru" "outPath" "drvPath" "hostDrv" "buildDrv" "type" "override" "deepOverride" "origArgs" "drvAttrs" "outputName" "all" "out" ]
# also drop functions such as .merge .override etc # also drop functions such as .merge .override etc
++ lib.filter (n: isFunction (getAttr n drv)) (attrNames drv); ++ lib.filter (n: isFunction (getAttr n drv)) (attrNames drv);
attrs = removeAttrs drv drop; attrs = removeAttrs drv drop;