diff options
| author | Marc Weber <marco-oweber@gmx.de> | 2007-08-18 22:29:00 +0000 |
|---|---|---|
| committer | Marc Weber <marco-oweber@gmx.de> | 2007-08-18 22:29:00 +0000 |
| commit | a3a9d407dafdc4cd6a7f5214f86c1183a04a4063 (patch) | |
| tree | 32c0f1aa33c8e8d56fb9c60b97e53e5d4d42ae4e /pkgs | |
| parent | 6af4bd3ca69db85478af692bd21b878bc13b829c (diff) | |
| download | nixpkgs-a3a9d407dafdc4cd6a7f5214f86c1183a04a4063.tar nixpkgs-a3a9d407dafdc4cd6a7f5214f86c1183a04a4063.tar.gz nixpkgs-a3a9d407dafdc4cd6a7f5214f86c1183a04a4063.tar.bz2 nixpkgs-a3a9d407dafdc4cd6a7f5214f86c1183a04a4063.tar.lz nixpkgs-a3a9d407dafdc4cd6a7f5214f86c1183a04a4063.tar.xz nixpkgs-a3a9d407dafdc4cd6a7f5214f86c1183a04a4063.tar.zst nixpkgs-a3a9d407dafdc4cd6a7f5214f86c1183a04a4063.zip | |
fix: listToAttrs added (which I had forgotten) when evaluating flags
svn path=/nixpkgs/trunk/; revision=9164
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/lib/default-unstable.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/lib/default-unstable.nix b/pkgs/lib/default-unstable.nix index ac87edd17e0..1d94b319191 100644 --- a/pkgs/lib/default-unstable.nix +++ b/pkgs/lib/default-unstable.nix @@ -220,8 +220,8 @@ rec { #in args.stdenv.mkDerivation { - # # passing the flags in case a library using this want's to check them .. - # inherit (co) flags buildInputs configureFlags; + # # passing the flags in case a library using this want's to check them (*) .. + # inherit (co) /* flags */ buildInputs configureFlags; # inherit (co.flags) justAOption; # extraSrc = (if co.flags.justAOption then null else src = .. ); @@ -232,6 +232,8 @@ rec { # }; #} + # (*) does'nt work because nix is seeing this set as derivation and complains about missing outpath.. :-( + # resolves chosen flags based on flagDescr passed dependencies in args @@ -289,7 +291,7 @@ rec { configureFlags = concatStrings (intersperse " " ( catAttrs "cfgOption" chosenFlat)) + (if (__hasAttr "profilingLibraries" chosen) then "" else " --disable-profiling"); - flags = map ( flag: av flag (__hasAttr flag chosen) ) (__attrNames flagDescr); + flags = listToAttrs (map ( flag: av flag (__hasAttr flag chosen) ) (__attrNames flagDescr)); }; } |