diff options
| author | Marc Weber <marco-oweber@gmx.de> | 2008-12-20 02:15:26 +0000 |
|---|---|---|
| committer | Marc Weber <marco-oweber@gmx.de> | 2008-12-20 02:15:26 +0000 |
| commit | 5638574907519b4648be691cf6779d509d843b07 (patch) | |
| tree | c652bb66ca5bc665838915ab41883a23f2e4409d /pkgs/lib/default.nix | |
| parent | e996113be7f41f067aaefac881c540b5ceb8d2d4 (diff) | |
| download | nixlib-5638574907519b4648be691cf6779d509d843b07.tar nixlib-5638574907519b4648be691cf6779d509d843b07.tar.gz nixlib-5638574907519b4648be691cf6779d509d843b07.tar.bz2 nixlib-5638574907519b4648be691cf6779d509d843b07.tar.lz nixlib-5638574907519b4648be691cf6779d509d843b07.tar.xz nixlib-5638574907519b4648be691cf6779d509d843b07.tar.zst nixlib-5638574907519b4648be691cf6779d509d843b07.zip | |
fixes for previous commit
svn path=/nixpkgs/trunk/; revision=13662
Diffstat (limited to 'pkgs/lib/default.nix')
| -rw-r--r-- | pkgs/lib/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/lib/default.nix b/pkgs/lib/default.nix index 6af24f6a6b00..3f7ba67ecf1e 100644 --- a/pkgs/lib/default.nix +++ b/pkgs/lib/default.nix @@ -803,7 +803,7 @@ rec { else throw "assertion of flag ${a} of derivation ${args.name} failed" ) args2.flags ); in removeAttrs - (mergeAttrsByFuncDefaults ([args] ++ opts)) + (mergeAttrsByFuncDefaults ([args] ++ opts ++ [{ passthru = cfgWithDefaults; }])) ["flags" "cfg" "mergeAttrBy" "fixed" ]; # fixed may be passed as fix argument or such } |