diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-01-04 15:06:21 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-01-04 15:06:21 +0000 |
| commit | 7fcf771c2ae9ce88b18605565a96bd3f8abff33f (patch) | |
| tree | b857079d685d18c0666f54da97154eefef567c63 | |
| parent | 0348f11e22b9575873d831cbc3a9bdcc08adbb33 (diff) | |
| download | nixlib-7fcf771c2ae9ce88b18605565a96bd3f8abff33f.tar nixlib-7fcf771c2ae9ce88b18605565a96bd3f8abff33f.tar.gz nixlib-7fcf771c2ae9ce88b18605565a96bd3f8abff33f.tar.bz2 nixlib-7fcf771c2ae9ce88b18605565a96bd3f8abff33f.tar.lz nixlib-7fcf771c2ae9ce88b18605565a96bd3f8abff33f.tar.xz nixlib-7fcf771c2ae9ce88b18605565a96bd3f8abff33f.tar.zst nixlib-7fcf771c2ae9ce88b18605565a96bd3f8abff33f.zip | |
* Handle the attributes added by the multiple outputs branch.
svn path=/nixpkgs/trunk/; revision=31278
| -rw-r--r-- | pkgs/lib/customisation.nix | 2 |
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; |