diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-08-21 15:37:52 -0500 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2018-08-22 01:14:53 +0200 |
| commit | f7bc33abf09c9a111b7b1d7f4eb6d322ace3efda (patch) | |
| tree | bfa263964d3f632681b6a0e19e671ae021916a62 /pkgs/development/libraries | |
| parent | 5a012fdbb3f7752b333cb631c39d73518e930559 (diff) | |
| download | nixlib-f7bc33abf09c9a111b7b1d7f4eb6d322ace3efda.tar nixlib-f7bc33abf09c9a111b7b1d7f4eb6d322ace3efda.tar.gz nixlib-f7bc33abf09c9a111b7b1d7f4eb6d322ace3efda.tar.bz2 nixlib-f7bc33abf09c9a111b7b1d7f4eb6d322ace3efda.tar.lz nixlib-f7bc33abf09c9a111b7b1d7f4eb6d322ace3efda.tar.xz nixlib-f7bc33abf09c9a111b7b1d7f4eb6d322ace3efda.tar.zst nixlib-f7bc33abf09c9a111b7b1d7f4eb6d322ace3efda.zip | |
Revert "treewide: fixup breakage due to absolute compiler path"
This reverts commit d0888d150333a2c523cd1e46606d6219afe23dc2.
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/podofo/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/zeroc-ice/default.nix | 5 |
2 files changed, 0 insertions, 10 deletions
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; |