BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ghc: disable parallel building for older versions again

Browse source 
This change accidentally crept in with the recent Darwin changes.
This commit is contained in:
Peter Simons 2015-02-14 09:37:45 +01:00
parent 2dc7059230
commit 155e926274
4 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/compilers/ghc/7.0.4.nix
View file

@ -13,8 +13,6 @@ stdenv.mkDerivation rec {
buildInputs = [ ghc perl gmp ncurses ]; buildInputs = [ ghc perl gmp ncurses ];
enableParallelBuilding = true;
buildMK = '' buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"

2
pkgs/development/compilers/ghc/7.2.2.nix
View file

@ -13,8 +13,6 @@ stdenv.mkDerivation rec {
buildInputs = [ ghc perl gmp ncurses ]; buildInputs = [ ghc perl gmp ncurses ];
enableParallelBuilding = true;
buildMK = '' buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"

2
pkgs/development/compilers/ghc/7.4.2.nix
View file

@ -14,8 +14,6 @@ stdenv.mkDerivation rec {
buildInputs = [ ghc perl gmp ncurses ]; buildInputs = [ ghc perl gmp ncurses ];
enableParallelBuilding = true;
buildMK = '' buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"

2
pkgs/development/compilers/ghc/7.6.3.nix
View file

@ -36,8 +36,6 @@ in stdenv.mkDerivation rec {
SRC_CC_OPTS += ${cFlags} SRC_CC_OPTS += ${cFlags}
''; '';
enableParallelBuilding = true;
preConfigure = '' preConfigure = ''
echo "${buildMK}" > mk/build.mk echo "${buildMK}" > mk/build.mk
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure