From 6b6f067397db8b9a3a051ad6616206871acf098c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 31 May 2016 20:47:48 -0500 Subject: [PATCH] qt56.qtbase: apply CMake setup-hook fix locally --- .../libraries/qt-5/5.6/qtbase/setup-hook.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) 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 0e73e0d31eb..8f86de93449 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,4 +141,17 @@ _qtLinkAllModules() { done } -preConfigureHooks+=(_qtLinkAllModules) +_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)