MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 07:46:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #181465 from milahu/qt6-fix-wrap-qt-apps-hook

Browse source 
qt6.wrapQtAppsHook: also wrap scripts, pretty error, show hints
This commit is contained in:
Kevin Cox 2022-07-14 13:22:05 -04:00 committed by GitHub
commit 2988dc447b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh
View file

@ -22,6 +22,11 @@ qtUnseenHostPath() {
qtHostPathHook() { qtHostPathHook() {
qtUnseenHostPath "$1" || return 0 qtUnseenHostPath "$1" || return 0
if ! [ -v qtPluginPrefix ]
then
echo "wrapQtAppsHook qtHostPathHook: qtPluginPrefix is unset. hint: add qt6.qtbase to buildInputs"
fi
local pluginDir="$1/${qtPluginPrefix:?}" local pluginDir="$1/${qtPluginPrefix:?}"
if [ -d "$pluginDir" ] if [ -d "$pluginDir" ]
then then
@ -34,7 +39,7 @@ qtHostPathHook() {
qtWrapperArgs+=(--prefix QML2_IMPORT_PATH : "$qmlDir") qtWrapperArgs+=(--prefix QML2_IMPORT_PATH : "$qmlDir")
fi fi
} }
addEnvHooks "$hostOffset" qtHostPathHook addEnvHooks "$targetOffset" qtHostPathHook
makeQtWrapper() { makeQtWrapper() {
local original="$1" local original="$1"
@ -85,8 +90,6 @@ wrapQtAppsHook() {
find "$targetDir" ! -type d -executable -print0 | while IFS= read -r -d '' file find "$targetDir" ! -type d -executable -print0 | while IFS= read -r -d '' file
do do
isELF "$file" || isMachO "$file" || continue
if [ -f "$file" ] if [ -f "$file" ]
then then
echo "wrapping $file" echo "wrapping $file"