fix: listToAttrs added (which I had forgotten) when evaluating flags
svn path=/nixpkgs/trunk/; revision=9164
This commit is contained in:
parent
6af4bd3ca6
commit
a3a9d407da
|
@ -220,8 +220,8 @@ rec {
|
||||||
|
|
||||||
#in args.stdenv.mkDerivation {
|
#in args.stdenv.mkDerivation {
|
||||||
|
|
||||||
# # passing the flags in case a library using this want's to check them ..
|
# # passing the flags in case a library using this want's to check them (*) ..
|
||||||
# inherit (co) flags buildInputs configureFlags;
|
# inherit (co) /* flags */ buildInputs configureFlags;
|
||||||
# inherit (co.flags) justAOption;
|
# inherit (co.flags) justAOption;
|
||||||
|
|
||||||
# extraSrc = (if co.flags.justAOption then null else src = .. );
|
# 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
|
# resolves chosen flags based on flagDescr passed dependencies in args
|
||||||
|
@ -289,7 +291,7 @@ rec {
|
||||||
configureFlags = concatStrings (intersperse " " ( catAttrs "cfgOption" chosenFlat))
|
configureFlags = concatStrings (intersperse " " ( catAttrs "cfgOption" chosenFlat))
|
||||||
+ (if (__hasAttr "profilingLibraries" chosen) then "" else " --disable-profiling");
|
+ (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));
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue