diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-21 12:05:01 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-21 12:34:33 +0200 |
| commit | d0888d150333a2c523cd1e46606d6219afe23dc2 (patch) | |
| tree | 174215e74549ca9b9882ca88e04cc2fdee42d83a /pkgs/applications | |
| parent | b300dddae1a9b1b80ec933ef8574766eb35fcb00 (diff) | |
| download | nixpkgs-d0888d150333a2c523cd1e46606d6219afe23dc2.tar nixpkgs-d0888d150333a2c523cd1e46606d6219afe23dc2.tar.gz nixpkgs-d0888d150333a2c523cd1e46606d6219afe23dc2.tar.bz2 nixpkgs-d0888d150333a2c523cd1e46606d6219afe23dc2.tar.lz nixpkgs-d0888d150333a2c523cd1e46606d6219afe23dc2.tar.xz nixpkgs-d0888d150333a2c523cd1e46606d6219afe23dc2.tar.zst nixpkgs-d0888d150333a2c523cd1e46606d6219afe23dc2.zip | |
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.
Diffstat (limited to 'pkgs/applications')
5 files changed, 23 insertions, 0 deletions
diff --git a/pkgs/applications/graphics/exrtools/default.nix b/pkgs/applications/graphics/exrtools/default.nix index 7980d09fed1..01af81d4de7 100644 --- a/pkgs/applications/graphics/exrtools/default.nix +++ b/pkgs/applications/graphics/exrtools/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 ]; diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index c37d26f3dbc..cfba3a0c83d 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -81,6 +81,11 @@ stdenv.mkDerivation rec { cd ../../.. ''; + preConfigure = '' + CC=${stdenv.cc.targetPrefix}cc + CXX=${stdenv.cc.targetPrefix}c++ + ''; + configureFlags = [ "--disable-static" "--disable-staticbins" diff --git a/pkgs/applications/science/logic/aiger/default.nix b/pkgs/applications/science/logic/aiger/default.nix index 03524fc6b22..a03e777a033 100644 --- a/pkgs/applications/science/logic/aiger/default.nix +++ b/pkgs/applications/science/logic/aiger/default.nix @@ -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 diff --git a/pkgs/applications/science/logic/verit/default.nix b/pkgs/applications/science/logic/verit/default.nix index ca3673d7bf9..d8873604b21 100644 --- a/pkgs/applications/science/logic/verit/default.nix +++ b/pkgs/applications/science/logic/verit/default.nix @@ -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 = '' diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index e42c1d5dd1e..13fa9d369b6 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -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"; |