Revert "treewide: fixup breakage due to absolute compiler path"
This reverts commit d0888d1503
.
This commit is contained in:
parent
5a012fdbb3
commit
f7bc33abf0
|
@ -9,11 +9,6 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "0jpkskqs1yjiighab4s91jy0c0qxcscwadfn94xy2mm2bx2qwp4z";
|
sha256 = "0jpkskqs1yjiighab4s91jy0c0qxcscwadfn94xy2mm2bx2qwp4z";
|
||||||
};
|
};
|
||||||
|
|
||||||
preConfigure = ''
|
|
||||||
CC=${stdenv.cc.targetPrefix}cc
|
|
||||||
CXX=${stdenv.cc.targetPrefix}c++
|
|
||||||
'';
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
buildInputs = [ stdenv openexr libpng12 libjpeg ];
|
buildInputs = [ stdenv openexr libpng12 libjpeg ];
|
||||||
|
|
||||||
|
|
|
@ -81,11 +81,6 @@ stdenv.mkDerivation rec {
|
||||||
cd ../../..
|
cd ../../..
|
||||||
'';
|
'';
|
||||||
|
|
||||||
preConfigure = ''
|
|
||||||
CC=${stdenv.cc.targetPrefix}cc
|
|
||||||
CXX=${stdenv.cc.targetPrefix}c++
|
|
||||||
'';
|
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--disable-static"
|
"--disable-static"
|
||||||
"--disable-staticbins"
|
"--disable-staticbins"
|
||||||
|
|
|
@ -12,9 +12,6 @@ stdenv.mkDerivation rec {
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
configurePhase = ''
|
configurePhase = ''
|
||||||
CC=${stdenv.cc.targetPrefix}cc
|
|
||||||
CXX=${stdenv.cc.targetPrefix}c++
|
|
||||||
|
|
||||||
# Set up picosat, so we can build 'aigbmc'
|
# Set up picosat, so we can build 'aigbmc'
|
||||||
mkdir ../picosat
|
mkdir ../picosat
|
||||||
ln -s ${picosat}/include/picosat/picosat.h ../picosat/picosat.h
|
ln -s ${picosat}/include/picosat/picosat.h ../picosat/picosat.h
|
||||||
|
|
|
@ -15,11 +15,6 @@ stdenv.mkDerivation rec {
|
||||||
# --disable-static actually enables static linking here...
|
# --disable-static actually enables static linking here...
|
||||||
dontDisableStatic = true;
|
dontDisableStatic = true;
|
||||||
|
|
||||||
preConfigure = ''
|
|
||||||
CC=${stdenv.cc.targetPrefix}gcc
|
|
||||||
CXX=${stdenv.cc.targetPrefix}g++
|
|
||||||
'';
|
|
||||||
|
|
||||||
makeFlags = [ "LEX=${flex}/bin/flex" ];
|
makeFlags = [ "LEX=${flex}/bin/flex" ];
|
||||||
|
|
||||||
preInstall = ''
|
preInstall = ''
|
||||||
|
|
|
@ -41,11 +41,6 @@ stdenv.mkDerivation rec {
|
||||||
sed -i 's,/sbin/shutdown,shutdown,' lib/system/systemLinux.c
|
sed -i 's,/sbin/shutdown,shutdown,' lib/system/systemLinux.c
|
||||||
'';
|
'';
|
||||||
|
|
||||||
preConfigure = ''
|
|
||||||
CC=${stdenv.cc.targetPrefix}cc
|
|
||||||
CXX=${stdenv.cc.targetPrefix}c++
|
|
||||||
'';
|
|
||||||
|
|
||||||
configureFlags = [ "--without-kernel-modules" "--without-xmlsecurity" ]
|
configureFlags = [ "--without-kernel-modules" "--without-xmlsecurity" ]
|
||||||
++ lib.optional (!withX) "--without-x";
|
++ lib.optional (!withX) "--without-x";
|
||||||
|
|
||||||
|
|
|
@ -19,11 +19,6 @@ stdenv.mkDerivation rec {
|
||||||
# TODO(@Dridus) remove the ++ libc at next hash break
|
# TODO(@Dridus) remove the ++ libc at next hash break
|
||||||
buildInputs = [ lua5 ] ++ stdenv.lib.optional stdenv.isLinux stdenv.cc.libc;
|
buildInputs = [ lua5 ] ++ stdenv.lib.optional stdenv.isLinux stdenv.cc.libc;
|
||||||
|
|
||||||
preConfigure = ''
|
|
||||||
CC=${stdenv.cc.targetPrefix}cc
|
|
||||||
CXX=${stdenv.cc.targetPrefix}c++
|
|
||||||
'';
|
|
||||||
|
|
||||||
cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF";
|
cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF";
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
|
|
@ -27,11 +27,6 @@ stdenv.mkDerivation rec {
|
||||||
--replace xcrun ""
|
--replace xcrun ""
|
||||||
'';
|
'';
|
||||||
|
|
||||||
preConfigure = ''
|
|
||||||
CC=${stdenv.cc.targetPrefix}cc
|
|
||||||
CXX=${stdenv.cc.targetPrefix}c++
|
|
||||||
'';
|
|
||||||
|
|
||||||
makeFlags = [ "prefix=$(out)" "OPTIMIZE=yes" ];
|
makeFlags = [ "prefix=$(out)" "OPTIMIZE=yes" ];
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
|
@ -28,10 +28,7 @@ stdenv.mkDerivation rec {
|
||||||
propagatedBuildInputs = [ gmp ];
|
propagatedBuildInputs = [ gmp ];
|
||||||
|
|
||||||
patchPhase = "patchShebangs ./z_pp.pl";
|
patchPhase = "patchShebangs ./z_pp.pl";
|
||||||
|
|
||||||
configurePhase = ''
|
configurePhase = ''
|
||||||
CC=${stdenv.cc.targetPrefix}cc
|
|
||||||
CXX=${stdenv.cc.targetPrefix}c++
|
|
||||||
./configure -installdir $out/lib/ocaml/${ocaml.version}/site-lib
|
./configure -installdir $out/lib/ocaml/${ocaml.version}/site-lib
|
||||||
'';
|
'';
|
||||||
preInstall = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib";
|
preInstall = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib";
|
||||||
|
|
|
@ -19,11 +19,6 @@ stdenv.mkDerivation rec {
|
||||||
gettext intltool libtool perl
|
gettext intltool libtool perl
|
||||||
];
|
];
|
||||||
|
|
||||||
preConfigure = ''
|
|
||||||
CC=${stdenv.cc.targetPrefix}cc
|
|
||||||
CXX=${stdenv.cc.targetPrefix}c++
|
|
||||||
'';
|
|
||||||
|
|
||||||
configureFlagsArray = ("CFLAGS=-include ${zlib.dev}/include/zlib.h");
|
configureFlagsArray = ("CFLAGS=-include ${zlib.dev}/include/zlib.h");
|
||||||
|
|
||||||
patches = [ ./gcc-fix.patch ];
|
patches = [ ./gcc-fix.patch ];
|
||||||
|
|
|
@ -30,11 +30,6 @@ stdenv.mkDerivation rec {
|
||||||
--replace "which %s" "${which}/bin/which %s"
|
--replace "which %s" "${which}/bin/which %s"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
preConfigure = ''
|
|
||||||
CC=${stdenv.cc.targetPrefix}cc
|
|
||||||
CXX=${stdenv.cc.targetPrefix}c++
|
|
||||||
'';
|
|
||||||
|
|
||||||
configureFlags = [ "--with-distributor=NixOS" ];
|
configureFlags = [ "--with-distributor=NixOS" ];
|
||||||
|
|
||||||
hardeningDisable = [ "format" ];
|
hardeningDisable = [ "format" ];
|
||||||
|
|
Loading…
Reference in a new issue