From d423a36aa53c3ba261b0e1c9583706b8598cd774 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 1 Jun 2016 07:02:47 -0500 Subject: [PATCH] Revert "qt56.qtbase: apply CMake setup-hook fix locally" This reverts commit 6b6f067397db8b9a3a051ad6616206871acf098c. --- .../libraries/qt-5/5.6/qtbase/setup-hook.sh | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh index 8f86de93449..0e73e0d31eb 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh @@ -141,17 +141,4 @@ _qtLinkAllModules() { done } -_qtFixCMake() { - for flag in $NIX_CFLAGS_COMPILE $NIX_LDFLAGS; do - case $flag in - -L*) - CMAKE_INSTALL_RPATH="$CMAKE_INSTALL_RPATH${CMAKE_INSTALL_RPATH:+:}${flag:2}" - ;; - esac - done - cmakeFlags="-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE $cmakeFlags" - cmakeFlags="-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=FALSE $cmakeFlags" - cmakeFlags="-DCMAKE_INSTALL_RPATH=$CMAKE_INSTALL_RPATH $cmakeFlags" -} - -preConfigureHooks+=(_qtLinkAllModules _qtFixCMake) +preConfigureHooks+=(_qtLinkAllModules)