Merge pull request #27940 from bkchr/fix_qt56_ld

QT5.6: Fixes compile error with wrong LD env variable
This commit is contained in:
Frederik Rietdijk 2017-08-07 13:04:43 +02:00 committed by GitHub
commit e7651e4b60

View file

@ -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 \