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

forgotten to update small name change in mkDerivationByConfiguration - fixed.

Browse Source 
all-packages should work again

svn path=/nixpkgs/trunk/; revision=9591
This commit is contained in:
Marc Weber 2007-11-05 21:30:59 +00:00
parent 0acef47d44
commit 378cd3374e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/top-level/all-packages.nix
View File

@ -189,16 +189,16 @@ rec {
meta = (if drv ? meta then drv.meta else {}) // {priority = "10";}; meta = (if drv ? meta then drv.meta else {}) // {priority = "10";};
}; };
mkDerivationByConfiguration = ({ flagConfig ? {}, optionals ? [], defaults ? [], mkDerivationByConfiguration = { flagConfig ? {}, optionals ? [], defaults ? [],
extraAttrs, collectExtraPhaseActions ? []} : extraAttrs, collectExtraPhaseActions ? []} :
args: with args.lib_unstable; with args; args: with args.lib; with args;
if ( __isAttrs extraAttrs ) then builtins.throw "the argument extraAttrs needs to be a function beeing passed co, but attribute set passed " if ( __isAttrs extraAttrs ) then builtins.throw "the argument extraAttrs needs to be a function beeing passed co, but attribute set passed "
else else
let co = chooseOptionsByFlags { inherit args flagConfig optionals defaults collectExtraPhaseActions; }; in let co = chooseOptionsByFlags { inherit args flagConfig optionals defaults collectExtraPhaseActions; }; in
args.stdenv.mkDerivation ( args.stdenv.mkDerivation (
{ {
inherit (co) configureFlags buildInputs; 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