forked from mirrors/nixpkgs
Revert "qt56.qtbase: apply CMake setup-hook fix locally"
This reverts commit 6b6f067397
.
This commit is contained in:
parent
f547137425
commit
d423a36aa5
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue