alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Revert "qt56.qtbase: apply CMake setup-hook fix locally"

Browse source 
This reverts commit 6b6f067397.
This commit is contained in:
Thomas Tuegel 2016-06-01 07:02:47 -05:00
parent f547137425
commit d423a36aa5
1 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh
View file

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