From 008b3d5d84ad300095eeee0b84ef1b5adb04c395 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 26 Apr 2016 14:21:10 -0500 Subject: qt55.qtbase: move moveToOutput hooks --- .../libraries/qt-5/5.5/qtbase/default.nix | 23 ++++++++++------------ 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix index f8dd82c88226b..f2071fa6f8fc1 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix @@ -111,19 +111,6 @@ stdenv.mkDerivation { export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$LD_LIBRARY_PATH" export MAKEFLAGS=-j$NIX_BUILD_CORES - _multioutQtDevs() { - # We cannot simply set these paths in configureFlags because libQtCore retains - # references to the paths it was built with. - moveToOutput "bin" "$dev" - moveToOutput "include" "$dev" - moveToOutput "mkspecs" "$dev" - - # The destination directory must exist or moveToOutput will do nothing - mkdir -p "$dev/share" - moveToOutput "share/doc" "$dev" - } - preFixupHooks+=(_multioutQtDevs) - configureFlags+="\ -plugindir $out/lib/qt5/plugins \ -importdir $out/lib/qt5/imports \ @@ -236,6 +223,16 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"; preFixup = '' + # We cannot simply set these paths in configureFlags because libQtCore retains + # references to the paths it was built with. + moveToOutput "bin" "$dev" + moveToOutput "include" "$dev" + moveToOutput "mkspecs" "$dev" + + # The destination directory must exist or moveToOutput will do nothing + mkdir -p "$dev/share" + moveToOutput "share/doc" "$dev" + # Move libtool archives and qmake projects if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then pushd "''${!outputLib}" -- cgit 1.4.1