From 155e92627441d1a98f85e57c9184b1175c30730f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Feb 2015 09:37:45 +0100 Subject: [PATCH] ghc: disable parallel building for older versions again This change accidentally crept in with the recent Darwin changes. --- pkgs/development/compilers/ghc/7.0.4.nix | 2 -- pkgs/development/compilers/ghc/7.2.2.nix | 2 -- pkgs/development/compilers/ghc/7.4.2.nix | 2 -- pkgs/development/compilers/ghc/7.6.3.nix | 2 -- 4 files changed, 8 deletions(-) diff --git a/pkgs/development/compilers/ghc/7.0.4.nix b/pkgs/development/compilers/ghc/7.0.4.nix index cd9c0613ad8..9e61be7b47f 100644 --- a/pkgs/development/compilers/ghc/7.0.4.nix +++ b/pkgs/development/compilers/ghc/7.0.4.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { buildInputs = [ ghc perl gmp ncurses ]; - enableParallelBuilding = true; - buildMK = '' libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" diff --git a/pkgs/development/compilers/ghc/7.2.2.nix b/pkgs/development/compilers/ghc/7.2.2.nix index c8f0ace3177..778b47afde7 100644 --- a/pkgs/development/compilers/ghc/7.2.2.nix +++ b/pkgs/development/compilers/ghc/7.2.2.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { buildInputs = [ ghc perl gmp ncurses ]; - enableParallelBuilding = true; - buildMK = '' libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix index 67ac4db097b..4e4a5f6024e 100644 --- a/pkgs/development/compilers/ghc/7.4.2.nix +++ b/pkgs/development/compilers/ghc/7.4.2.nix @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { buildInputs = [ ghc perl gmp ncurses ]; - enableParallelBuilding = true; - buildMK = '' libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" diff --git a/pkgs/development/compilers/ghc/7.6.3.nix b/pkgs/development/compilers/ghc/7.6.3.nix index e47dc4fc10e..4eb6e425f35 100644 --- a/pkgs/development/compilers/ghc/7.6.3.nix +++ b/pkgs/development/compilers/ghc/7.6.3.nix @@ -36,8 +36,6 @@ in stdenv.mkDerivation rec { SRC_CC_OPTS += ${cFlags} ''; - enableParallelBuilding = true; - preConfigure = '' echo "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure