pyrox.dev / nixpkgs
lol
fork atom

Revert "treewide: fixup breakage due to absolute compiler path"

This reverts commit d0888d150333a2c523cd1e46606d6219afe23dc2.

authored by

Matthew Bauer and committed by
Robin Gloster f7bc33ab 5a012fdb

-46
-5
pkgs/applications/graphics/exrtools/default.nix
··· 9 9 sha256 = "0jpkskqs1yjiighab4s91jy0c0qxcscwadfn94xy2mm2bx2qwp4z"; 10 10 }; 11 11 12 - preConfigure = '' 13 - CC=${stdenv.cc.targetPrefix}cc 14 - CXX=${stdenv.cc.targetPrefix}c++ 15 - ''; 16 - 17 12 nativeBuildInputs = [ pkgconfig ]; 18 13 buildInputs = [ stdenv openexr libpng12 libjpeg ]; 19 14
-5
pkgs/applications/misc/kiwix/default.nix
··· 81 81 cd ../../.. 82 82 ''; 83 83 84 - preConfigure = '' 85 - CC=${stdenv.cc.targetPrefix}cc 86 - CXX=${stdenv.cc.targetPrefix}c++ 87 - ''; 88 - 89 84 configureFlags = [ 90 85 "--disable-static" 91 86 "--disable-staticbins"
-3
pkgs/applications/science/logic/aiger/default.nix
··· 12 12 enableParallelBuilding = true; 13 13 14 14 configurePhase = '' 15 - CC=${stdenv.cc.targetPrefix}cc 16 - CXX=${stdenv.cc.targetPrefix}c++ 17 - 18 15 # Set up picosat, so we can build 'aigbmc' 19 16 mkdir ../picosat 20 17 ln -s ${picosat}/include/picosat/picosat.h ../picosat/picosat.h
-5
pkgs/applications/science/logic/verit/default.nix
··· 15 15 # --disable-static actually enables static linking here... 16 16 dontDisableStatic = true; 17 17 18 - preConfigure = '' 19 - CC=${stdenv.cc.targetPrefix}gcc 20 - CXX=${stdenv.cc.targetPrefix}g++ 21 - ''; 22 - 23 18 makeFlags = [ "LEX=${flex}/bin/flex" ]; 24 19 25 20 preInstall = ''
-5
pkgs/applications/virtualization/open-vm-tools/default.nix
··· 41 41 sed -i 's,/sbin/shutdown,shutdown,' lib/system/systemLinux.c 42 42 ''; 43 43 44 - preConfigure = '' 45 - CC=${stdenv.cc.targetPrefix}cc 46 - CXX=${stdenv.cc.targetPrefix}c++ 47 - ''; 48 - 49 44 configureFlags = [ "--without-kernel-modules" "--without-xmlsecurity" ] 50 45 ++ lib.optional (!withX) "--without-x"; 51 46
-5
pkgs/development/libraries/podofo/default.nix
··· 19 19 # TODO(@Dridus) remove the ++ libc at next hash break 20 20 buildInputs = [ lua5 ] ++ stdenv.lib.optional stdenv.isLinux stdenv.cc.libc; 21 21 22 - preConfigure = '' 23 - CC=${stdenv.cc.targetPrefix}cc 24 - CXX=${stdenv.cc.targetPrefix}c++ 25 - ''; 26 - 27 22 cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF"; 28 23 29 24 meta = {
-5
pkgs/development/libraries/zeroc-ice/default.nix
··· 27 27 --replace xcrun "" 28 28 ''; 29 29 30 - preConfigure = '' 31 - CC=${stdenv.cc.targetPrefix}cc 32 - CXX=${stdenv.cc.targetPrefix}c++ 33 - ''; 34 - 35 30 makeFlags = [ "prefix=$(out)" "OPTIMIZE=yes" ]; 36 31 37 32 enableParallelBuilding = true;
-3
pkgs/development/ocaml-modules/zarith/default.nix
··· 28 28 propagatedBuildInputs = [ gmp ]; 29 29 30 30 patchPhase = "patchShebangs ./z_pp.pl"; 31 - 32 31 configurePhase = '' 33 - CC=${stdenv.cc.targetPrefix}cc 34 - CXX=${stdenv.cc.targetPrefix}c++ 35 32 ./configure -installdir $out/lib/ocaml/${ocaml.version}/site-lib 36 33 ''; 37 34 preInstall = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib";
-5
pkgs/games/warmux/default.nix
··· 19 19 gettext intltool libtool perl 20 20 ]; 21 21 22 - preConfigure = '' 23 - CC=${stdenv.cc.targetPrefix}cc 24 - CXX=${stdenv.cc.targetPrefix}c++ 25 - ''; 26 - 27 22 configureFlagsArray = ("CFLAGS=-include ${zlib.dev}/include/zlib.h"); 28 23 29 24 patches = [ ./gcc-fix.patch ];
-5
pkgs/games/warzone2100/default.nix
··· 30 30 --replace "which %s" "${which}/bin/which %s" 31 31 ''; 32 32 33 - preConfigure = '' 34 - CC=${stdenv.cc.targetPrefix}cc 35 - CXX=${stdenv.cc.targetPrefix}c++ 36 - ''; 37 - 38 33 configureFlags = [ "--with-distributor=NixOS" ]; 39 34 40 35 hardeningDisable = [ "format" ];