From 8c7f2153818ce63533177f144305a88932ff042c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 6 Oct 2007 18:17:47 +0000
Subject: Uncommented mkDerivationByName. Now it doesn't break everything

svn path=/nixpkgs/trunk/; revision=9415
---
 pkgs/lib/default-unstable.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs/lib')

diff --git a/pkgs/lib/default-unstable.nix b/pkgs/lib/default-unstable.nix
index b718383e5446d..2de6ce19b95e0 100644
--- a/pkgs/lib/default-unstable.nix
+++ b/pkgs/lib/default-unstable.nix
@@ -212,7 +212,7 @@ rec {
   # see mkDerivationByConfiguration in all-packages.nix and the examples given below.
   # You can just copy paste them into all-packages.nix to test them..
 
-  /*chooseOptionsByFlags = { flagConfig, args, optionals ? [], defaults ? [],
+  chooseOptionsByFlags = { flagConfig, args, optionals ? [], defaults ? [],
                            collectExtraPhaseActions ? [] } :
     let passedOptionals = filter ( x : __hasAttr x args ) optionals; # these are in optionals and in args
         # we simply merge in <optional_name> = { buildInputs = <arg.<optional_name>; pass = <arg.optional_name>; }
@@ -223,7 +223,7 @@ rec {
                passedOptionals ) );
 
     in chooseOptionsByFlags2 flagConfigWithOptionals collectExtraPhaseActions args 
-       ( (getAttr ["flags"] defaults args) ++ passedOptionals);*/
+       ( (getAttr ["flags"] defaults args) ++ passedOptionals);
 
   chooseOptionsByFlags2 = flagConfig : collectExtraPhaseActions : args : flags :
     let   
@@ -323,7 +323,7 @@ rec {
   # * extra phase dependend commands can be added
   #   Its easy to add your own stuff using co.collectAttrs or co.optsConcatStrs 
   #   ( perhaps this name will change?)
-/*  simpleFlagYesNoF = namePrefix : extraFlagAttrs : mkDerivationByConfiguration ( {
+  simpleFlagYesNoF = namePrefix : extraFlagAttrs : mkDerivationByConfiguration ( {
     flagConfig = {
       flag    = { name = namePrefix + "simpleYes"; 
                   cfgOption = [ "--Yes" "--you-dont-need-a-list" ]; 
@@ -380,7 +380,7 @@ rec {
       ";
     configurePhase = co.extraConfigureCmd;
     };
-  } // extraFlagAttrs ); */
+  } // extraFlagAttrs ); 
 
 
   simpleYes = simpleFlagYesNoF "" {} {
-- 
cgit 1.4.1