From f7bc33abf09c9a111b7b1d7f4eb6d322ace3efda Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 21 Aug 2018 15:37:52 -0500 Subject: Revert "treewide: fixup breakage due to absolute compiler path" This reverts commit d0888d150333a2c523cd1e46606d6219afe23dc2. --- pkgs/applications/graphics/exrtools/default.nix | 5 ----- pkgs/applications/misc/kiwix/default.nix | 5 ----- pkgs/applications/science/logic/aiger/default.nix | 3 --- pkgs/applications/science/logic/verit/default.nix | 5 ----- pkgs/applications/virtualization/open-vm-tools/default.nix | 5 ----- pkgs/development/libraries/podofo/default.nix | 5 ----- pkgs/development/libraries/zeroc-ice/default.nix | 5 ----- pkgs/development/ocaml-modules/zarith/default.nix | 3 --- pkgs/games/warmux/default.nix | 5 ----- pkgs/games/warzone2100/default.nix | 5 ----- 10 files changed, 46 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/graphics/exrtools/default.nix b/pkgs/applications/graphics/exrtools/default.nix index 01af81d4de74..7980d09fed12 100644 --- a/pkgs/applications/graphics/exrtools/default.nix +++ b/pkgs/applications/graphics/exrtools/default.nix @@ -9,11 +9,6 @@ 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 cfba3a0c83d1..c37d26f3dbcc 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -81,11 +81,6 @@ 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 a03e777a033e..03524fc6b222 100644 --- a/pkgs/applications/science/logic/aiger/default.nix +++ b/pkgs/applications/science/logic/aiger/default.nix @@ -12,9 +12,6 @@ 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 d8873604b213..ca3673d7bf97 100644 --- a/pkgs/applications/science/logic/verit/default.nix +++ b/pkgs/applications/science/logic/verit/default.nix @@ -15,11 +15,6 @@ 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 13fa9d369b60..e42c1d5dd1e4 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -41,11 +41,6 @@ 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"; diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index 51e2b5059749..9a43470de3b7 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -19,11 +19,6 @@ 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 = { diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix index 4369a9765e58..063d64c69058 100644 --- a/pkgs/development/libraries/zeroc-ice/default.nix +++ b/pkgs/development/libraries/zeroc-ice/default.nix @@ -27,11 +27,6 @@ stdenv.mkDerivation rec { --replace xcrun "" ''; - preConfigure = '' - CC=${stdenv.cc.targetPrefix}cc - CXX=${stdenv.cc.targetPrefix}c++ - ''; - makeFlags = [ "prefix=$(out)" "OPTIMIZE=yes" ]; enableParallelBuilding = true; diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index 7b76919241de..e5d954970589 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -28,10 +28,7 @@ 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"; diff --git a/pkgs/games/warmux/default.nix b/pkgs/games/warmux/default.nix index 29e8042ac7ac..a56afbbf44b5 100644 --- a/pkgs/games/warmux/default.nix +++ b/pkgs/games/warmux/default.nix @@ -19,11 +19,6 @@ 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 ]; diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 65e5669d86a6..6165cacfdca5 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -30,11 +30,6 @@ 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" ]; -- cgit 1.4.1