treewide: fixup breakage due to absolute compiler path

Some packages just can't handle them #44767.  It was tempting to try
to abstract this in some way, but I didn't do that ATM.
wip/yesman
Vladimír Čunát 6 years ago
parent b300dddae1
commit d0888d1503
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
  1. 5
      pkgs/applications/graphics/exrtools/default.nix
  2. 5
      pkgs/applications/misc/kiwix/default.nix
  3. 3
      pkgs/applications/science/logic/aiger/default.nix
  4. 5
      pkgs/applications/science/logic/verit/default.nix
  5. 5
      pkgs/applications/virtualization/open-vm-tools/default.nix
  6. 5
      pkgs/development/libraries/podofo/default.nix
  7. 5
      pkgs/development/libraries/zeroc-ice/default.nix
  8. 3
      pkgs/development/ocaml-modules/zarith/default.nix
  9. 5
      pkgs/games/warmux/default.nix
  10. 5
      pkgs/games/warzone2100/default.nix

@ -9,6 +9,11 @@ stdenv.mkDerivation rec {
sha256 = "0jpkskqs1yjiighab4s91jy0c0qxcscwadfn94xy2mm2bx2qwp4z";
};
preConfigure = ''
CC=${stdenv.cc.targetPrefix}cc
CXX=${stdenv.cc.targetPrefix}c++
'';
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ stdenv openexr libpng12 libjpeg ];

@ -81,6 +81,11 @@ stdenv.mkDerivation rec {
cd ../../..
'';
preConfigure = ''
CC=${stdenv.cc.targetPrefix}cc
CXX=${stdenv.cc.targetPrefix}c++
'';
configureFlags = [
"--disable-static"
"--disable-staticbins"

@ -12,6 +12,9 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
configurePhase = ''
CC=${stdenv.cc.targetPrefix}cc
CXX=${stdenv.cc.targetPrefix}c++
# Set up picosat, so we can build 'aigbmc'
mkdir ../picosat
ln -s ${picosat}/include/picosat/picosat.h ../picosat/picosat.h

@ -15,6 +15,11 @@ stdenv.mkDerivation rec {
# --disable-static actually enables static linking here...
dontDisableStatic = true;
preConfigure = ''
CC=${stdenv.cc.targetPrefix}gcc
CXX=${stdenv.cc.targetPrefix}g++
'';
makeFlags = [ "LEX=${flex}/bin/flex" ];
preInstall = ''

@ -41,6 +41,11 @@ stdenv.mkDerivation rec {
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" ]
++ lib.optional (!withX) "--without-x";

@ -19,6 +19,11 @@ stdenv.mkDerivation rec {
# TODO(@Dridus) remove the ++ libc at next hash break
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";
meta = {

@ -27,6 +27,11 @@ stdenv.mkDerivation rec {
--replace xcrun ""
'';
preConfigure = ''
CC=${stdenv.cc.targetPrefix}cc
CXX=${stdenv.cc.targetPrefix}c++
'';
makeFlags = [ "prefix=$(out)" "OPTIMIZE=yes" ];
enableParallelBuilding = true;

@ -28,7 +28,10 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ gmp ];
patchPhase = "patchShebangs ./z_pp.pl";
configurePhase = ''
CC=${stdenv.cc.targetPrefix}cc
CXX=${stdenv.cc.targetPrefix}c++
./configure -installdir $out/lib/ocaml/${ocaml.version}/site-lib
'';
preInstall = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib";

@ -19,6 +19,11 @@ stdenv.mkDerivation rec {
gettext intltool libtool perl
];
preConfigure = ''
CC=${stdenv.cc.targetPrefix}cc
CXX=${stdenv.cc.targetPrefix}c++
'';
configureFlagsArray = ("CFLAGS=-include ${zlib.dev}/include/zlib.h");
patches = [ ./gcc-fix.patch ];

@ -30,6 +30,11 @@ stdenv.mkDerivation rec {
--replace "which %s" "${which}/bin/which %s"
'';
preConfigure = ''
CC=${stdenv.cc.targetPrefix}cc
CXX=${stdenv.cc.targetPrefix}c++
'';
configureFlags = [ "--with-distributor=NixOS" ];
hardeningDisable = [ "format" ];

Loading…
Cancel
Save