diff options
| author | Marc Weber <marco-oweber@gmx.de> | 2010-02-18 01:49:22 +0000 |
|---|---|---|
| committer | Marc Weber <marco-oweber@gmx.de> | 2010-02-18 01:49:22 +0000 |
| commit | 4007d197004abf1abdf31cf0c001e33a287e94cb (patch) | |
| tree | f172a028d6b697b8d56824bc7e258c74aca9c7f5 /pkgs/lib/misc.nix | |
| parent | 6a48baead341a76ae1a3ae173d53d3f0a2f61081 (diff) | |
| download | nixpkgs-4007d197004abf1abdf31cf0c001e33a287e94cb.tar nixpkgs-4007d197004abf1abdf31cf0c001e33a287e94cb.tar.gz nixpkgs-4007d197004abf1abdf31cf0c001e33a287e94cb.tar.bz2 nixpkgs-4007d197004abf1abdf31cf0c001e33a287e94cb.tar.lz nixpkgs-4007d197004abf1abdf31cf0c001e33a287e94cb.tar.xz nixpkgs-4007d197004abf1abdf31cf0c001e33a287e94cb.tar.zst nixpkgs-4007d197004abf1abdf31cf0c001e33a287e94cb.zip | |
fix vim_configurable
svn path=/nixpkgs/trunk/; revision=20084
Diffstat (limited to 'pkgs/lib/misc.nix')
| -rw-r--r-- | pkgs/lib/misc.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/lib/misc.nix b/pkgs/lib/misc.nix index f2898e4bef8..05e375dac14 100644 --- a/pkgs/lib/misc.nix +++ b/pkgs/lib/misc.nix @@ -286,7 +286,7 @@ rec { mergeAttrsByFuncDefaults = foldl mergeAttrByFunc { inherit mergeAttrBy; }; # sane defaults (same name as attr name so that inherit can be used) mergeAttrBy = # { buildInputs = concatList; [...]; passthru = mergeAttr; [..]; } - listToAttrs (map (n : nameValuePair n lib.concat) [ "buildInputs" "propagatedBuildInputs" "configureFlags" "prePhases" "postAll" ]) + listToAttrs (map (n : nameValuePair n lib.concat) [ "buildNativeInputs" "buildInputs" "propagatedBuildInputs" "configureFlags" "prePhases" "postAll" ]) // listToAttrs (map (n : nameValuePair n lib.mergeAttrs) [ "passthru" "meta" "cfg" "flags" ]) // listToAttrs (map (n : nameValuePair n (a: b: "${a}\n${b}") ) [ "preConfigure" ]) ; |