JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: listToAttrs added (which I had forgotten) when evaluating flags

Browse Source 
svn path=/nixpkgs/trunk/; revision=9164
This commit is contained in:
Marc Weber 2007-08-18 22:29:00 +00:00
parent 6af4bd3ca6
commit a3a9d407da
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/lib/default-unstable.nix
View File

@ -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));
};
}