diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-07-31 09:12:15 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-07-31 09:12:15 +0200 |
| commit | 740d76371e6c1c76bae4801fc5b736a796c1ebbe (patch) | |
| tree | 3ea7c544ae005bd5d7c19cb45fb17a886baeb729 /pkgs/development/libraries/qt-4.x/4.8/default.nix | |
| parent | 2a48a62b9cfe99140bfa9d45fca960be848f87fe (diff) | |
| parent | ba68231273bea4cba01413fd2a0e56d68db9234c (diff) | |
| download | nixlib-740d76371e6c1c76bae4801fc5b736a796c1ebbe.tar nixlib-740d76371e6c1c76bae4801fc5b736a796c1ebbe.tar.gz nixlib-740d76371e6c1c76bae4801fc5b736a796c1ebbe.tar.bz2 nixlib-740d76371e6c1c76bae4801fc5b736a796c1ebbe.tar.lz nixlib-740d76371e6c1c76bae4801fc5b736a796c1ebbe.tar.xz nixlib-740d76371e6c1c76bae4801fc5b736a796c1ebbe.tar.zst nixlib-740d76371e6c1c76bae4801fc5b736a796c1ebbe.zip | |
Merge commit 'ba68231273bea4cba01413fd2a0e56d68db9234c' into HEAD
Diffstat (limited to 'pkgs/development/libraries/qt-4.x/4.8/default.nix')
| -rw-r--r-- | pkgs/development/libraries/qt-4.x/4.8/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index d3eaeed2f1e0..1b87b1b0a27b 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -114,6 +114,7 @@ stdenv.mkDerivation rec { -datadir $out/share/${name} -translationdir $out/share/${name}/translations " + unset LD # Makefile uses gcc for linking; setting LD interferes '' + optionalString stdenv.cc.isClang '' sed -i 's/QMAKE_CC = gcc/QMAKE_CC = clang/' mkspecs/common/g++-base.conf sed -i 's/QMAKE_CXX = g++/QMAKE_CXX = clang++/' mkspecs/common/g++-base.conf |