summaryrefslogtreecommitdiffstats
path: root/pkgs/lib
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2012-01-04 15:06:21 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-01-04 15:06:21 +0000
commit7fcf771c2ae9ce88b18605565a96bd3f8abff33f (patch)
treeb857079d685d18c0666f54da97154eefef567c63 /pkgs/lib
parent0348f11e22b9575873d831cbc3a9bdcc08adbb33 (diff)
* Handle the attributes added by the multiple outputs branch.
svn path=/nixpkgs/trunk/; revision=31278
Diffstat (limited to 'pkgs/lib')
-rw-r--r--pkgs/lib/customisation.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/lib/customisation.nix b/pkgs/lib/customisation.nix
index d2af48146284..b914d4ca6033 100644
--- a/pkgs/lib/customisation.nix
+++ b/pkgs/lib/customisation.nix
@@ -34,7 +34,7 @@ rec {
overrideDerivation = drv: f:
let
# 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
++ lib.filter (n: isFunction (getAttr n drv)) (attrNames drv);
attrs = removeAttrs drv drop;