svn path=/nixpkgs/trunk/; revision=9485

This commit is contained in:
Eelco Dolstra 2007-10-19 14:19:39 +00:00
parent 17dccfe4f4
commit f154e79040

View File

@ -190,7 +190,7 @@ rec {
}; };
# commented out because it's using the new configuration style proposal which is unstable # commented out because it's using the new configuration style proposal which is unstable
/*
mkDerivationByConfiguration = ({ flagConfig ? {}, optionals ? [], defaults ? [], mkDerivationByConfiguration = ({ flagConfig ? {}, optionals ? [], defaults ? [],
extraAttrs, collectExtraPhaseActions ? []} : extraAttrs, collectExtraPhaseActions ? []} :
args: with args.lib_unstable; with args; args: with args.lib_unstable; with args;
@ -201,6 +201,7 @@ rec {
{ {
inherit (co) configureFlags buildInputs /*flags*/; inherit (co) configureFlags buildInputs /*flags*/;
} // extraAttrs co // co.pass // co.flags_prefixed )); } // extraAttrs co // co.pass // co.flags_prefixed ));
*/
# Check absence of non-used options # Check absence of non-used options