From 38262f960f95c7f83c12b579f7cfe52f066141bf Mon Sep 17 00:00:00 2001
From: Milan Hauth <milahu@gmail.com>
Date: Thu, 14 Jul 2022 12:04:33 +0200
Subject: [PATCH 1/3] qt6.wrapQtAppsHook: fix: also wrap scripts

---
 pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh b/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh
index c085cdaca52e..63a1b7ec6f41 100644
--- a/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh
+++ b/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh
@@ -85,8 +85,6 @@ wrapQtAppsHook() {
 
         find "$targetDir" ! -type d -executable -print0 | while IFS= read -r -d '' file
         do
-            isELF "$file" || isMachO "$file" || continue
-
             if [ -f "$file" ]
             then
                 echo "wrapping $file"

From 1fb721156a93c006cf32d2585779a7cf32541a8d Mon Sep 17 00:00:00 2001
From: Milan Hauth <milahu@gmail.com>
Date: Thu, 14 Jul 2022 14:12:45 +0200
Subject: [PATCH 2/3] qt6.wrapQtAppsHook: fix addEnvHooks: hostOffset ->
 targetOffset

use buildInputs from buildPythonPackage
---
 pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh b/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh
index 63a1b7ec6f41..95e92d5f366f 100644
--- a/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh
+++ b/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh
@@ -34,7 +34,7 @@ qtHostPathHook() {
         qtWrapperArgs+=(--prefix QML2_IMPORT_PATH : "$qmlDir")
     fi
 }
-addEnvHooks "$hostOffset" qtHostPathHook
+addEnvHooks "$targetOffset" qtHostPathHook
 
 makeQtWrapper() {
     local original="$1"

From b182d552d56914ce7c9240d981281537be561aea Mon Sep 17 00:00:00 2001
From: Milan Hauth <milahu@gmail.com>
Date: Thu, 14 Jul 2022 12:49:00 +0200
Subject: [PATCH 3/3] qt6.wrapQtAppsHook: pretty error on missing buildInputs

---
 pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh b/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh
index 95e92d5f366f..b669da3d058c 100644
--- a/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh
+++ b/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh
@@ -22,6 +22,11 @@ qtUnseenHostPath() {
 qtHostPathHook() {
     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:?}"
     if [ -d "$pluginDir" ]
     then