From f114f1a64ef81ac60b21ade86fd541832eb29142 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Sat, 15 Aug 2009 14:17:16 +0000 Subject: [PATCH] Fixed it, because otherwise it keeps looping svn path=/nixpkgs/trunk/; revision=16724 --- pkgs/development/libraries/qt-4.5/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/qt-4.5/default.nix b/pkgs/development/libraries/qt-4.5/default.nix index 7aebc9c8ad1..167194b209a 100644 --- a/pkgs/development/libraries/qt-4.5/default.nix +++ b/pkgs/development/libraries/qt-4.5/default.nix @@ -56,10 +56,8 @@ stdenv.mkDerivation { ${if buildDemos == true then "" else "-nomake demos"} ${if buildExamples == true then "" else "-nomake examples"} ''; - - # For some reason I cannot automatically choose the edition, except by passing - # 'o' the the stdin of configure - configureScript = "yes o | ./configure"; + + configurePhase = "echo o | ./configure $configureFlags"; patchPhase = '' substituteInPlace configure --replace /bin/pwd pwd