diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2017-08-07 13:04:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-07 13:04:43 +0200 |
| commit | e7651e4b60929e59f4863132c140bc022c5e14f5 (patch) | |
| tree | e39c3a6cb8d5e12833ef3ccef1740e789f890d7c /pkgs/development/libraries | |
| parent | f152749c9940cda448153aa4d36dcaea538af8b1 (diff) | |
| parent | 0053bf6d472475cdd924e1edc606639472bc34f4 (diff) | |
| download | nixlib-e7651e4b60929e59f4863132c140bc022c5e14f5.tar nixlib-e7651e4b60929e59f4863132c140bc022c5e14f5.tar.gz nixlib-e7651e4b60929e59f4863132c140bc022c5e14f5.tar.bz2 nixlib-e7651e4b60929e59f4863132c140bc022c5e14f5.tar.lz nixlib-e7651e4b60929e59f4863132c140bc022c5e14f5.tar.xz nixlib-e7651e4b60929e59f4863132c140bc022c5e14f5.tar.zst nixlib-e7651e4b60929e59f4863132c140bc022c5e14f5.zip | |
Merge pull request #27940 from bkchr/fix_qt56_ld
QT5.6: Fixes compile error with wrong LD env variable
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.6/qtbase/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix index 2092ae5309a6..f2e18233d913 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix @@ -103,6 +103,8 @@ stdenv.mkDerivation { preConfigure = '' export LD_LIBRARY_PATH="$PWD/lib:$PWD/plugins/platforms:$LD_LIBRARY_PATH" export MAKEFLAGS=-j$NIX_BUILD_CORES + # We need to set LD to CXX or otherwise we get nasty compile errors + export LD=$CXX configureFlags+="\ -plugindir $out/$qtPluginPrefix \ |