From 448b75b87b1e0977149754edd9b3edca27c2f42d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 2 Nov 2010 13:24:12 +0000 Subject: [PATCH] Removing a fix made for gcc 4.3 in php expression. Now it builds with -O2 as usual, instead of -O1. svn path=/nixpkgs/trunk/; revision=24570 --- pkgs/development/interpreters/php/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 3f3efa782753..8277021b0dc3 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -134,13 +134,11 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { gdSupport = getConfig ["php" "gd"] true; }; - # only -O1 configurePhase = '' iniFile=$out/etc/php-recommended.ini [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin ./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags echo configurePhase end - sed -e 's/-O2/-O1/g' -i Makefile # http://bugs.php.net/bug.php?id=47730&edit=3 ''; installPhase = ''