diff options
| author | Marc Weber <marco-oweber@gmx.de> | 2009-08-20 20:18:58 +0000 |
|---|---|---|
| committer | Marc Weber <marco-oweber@gmx.de> | 2009-08-20 20:18:58 +0000 |
| commit | e7dc0625790081b07d3515ed5828cc42b88daff3 (patch) | |
| tree | 7c56fadba024e35953ff77d52e9830b6556e2bbf /pkgs/lib/misc.nix | |
| parent | d0a9bac4c1caa9db5a104c08d618861ec3e7b52d (diff) | |
| download | nixpkgs-e7dc0625790081b07d3515ed5828cc42b88daff3.tar nixpkgs-e7dc0625790081b07d3515ed5828cc42b88daff3.tar.gz nixpkgs-e7dc0625790081b07d3515ed5828cc42b88daff3.tar.bz2 nixpkgs-e7dc0625790081b07d3515ed5828cc42b88daff3.tar.lz nixpkgs-e7dc0625790081b07d3515ed5828cc42b88daff3.tar.xz nixpkgs-e7dc0625790081b07d3515ed5828cc42b88daff3.tar.zst nixpkgs-e7dc0625790081b07d3515ed5828cc42b88daff3.zip | |
adding xapian and xapian-bindings
svn path=/nixpkgs/trunk/; revision=16788
Diffstat (limited to 'pkgs/lib/misc.nix')
| -rw-r--r-- | pkgs/lib/misc.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/lib/misc.nix b/pkgs/lib/misc.nix index dc73a2f6886..60aecd5aa63 100644 --- a/pkgs/lib/misc.nix +++ b/pkgs/lib/misc.nix @@ -325,7 +325,9 @@ rec { # 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.mergeAttrs) [ "passthru" "meta" "cfg" "flags" ]); + // listToAttrs (map (n : nameValuePair n lib.mergeAttrs) [ "passthru" "meta" "cfg" "flags" ]) + // listToAttrs (map (n : nameValuePair n (a: b: "${a}\n${b}") ) [ "preConfigure" ]) + ; # returns atribute values as a list flattenAttrs = set : map ( attr : builtins.getAttr attr set) (attrNames set); |