From ca34e075e45b625fba536af69409711140c7daff Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 31 May 2016 06:27:18 -0500
Subject: qt56.qtbase: create symlink farm in one pass

---
 .../libraries/qt-5/5.6/qtbase/setup-hook.sh        | 27 ++++++++++++++++------
 pkgs/development/libraries/qt-5/5.6/setup-hook.sh  |  9 ++------
 2 files changed, 22 insertions(+), 14 deletions(-)

(limited to 'pkgs/development/libraries/qt-5/5.6')

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 d1ad9584aa7e9..0e73e0d31ebf3 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
@@ -112,7 +112,7 @@ EOF
 
     # Set PATH to find qmake first in a preConfigure hook
     # It must run after all the envHooks!
-    postHooks+=(_qtSetQmakePath)
+    preConfigureHooks+=(_qtSetQmakePath)
 fi
 
 qt5LinkModuleDir() {
@@ -122,10 +122,23 @@ qt5LinkModuleDir() {
     fi
 }
 
-qt5LinkModuleDir @out@ "lib"
+NIX_QT5_MODULES="${NIX_QT5_MODULES}${NIX_QT5_MODULES:+:}@out@"
+NIX_QT5_MODULES_DEV="${NIX_QT5_MODULES_DEV}${NIX_QT5_MODULES_DEV:+:}@dev@"
 
-qt5LinkModuleDir @dev@ "bin"
-qt5LinkModuleDir @dev@ "include"
-qt5LinkModuleDir @dev@ "lib"
-qt5LinkModuleDir @dev@ "mkspecs"
-qt5LinkModuleDir @dev@ "share"
+_qtLinkAllModules() {
+    IFS=: read -a modules <<< $NIX_QT5_MODULES
+    for module in ${modules[@]}; do
+        qt5LinkModuleDir "$module" "lib"
+    done
+
+    IFS=: read -a modules <<< $NIX_QT5_MODULES_DEV
+    for module in ${modules[@]}; do
+        qt5LinkModuleDir "$module" "bin"
+        qt5LinkModuleDir "$module" "include"
+        qt5LinkModuleDir "$module" "lib"
+        qt5LinkModuleDir "$module" "mkspecs"
+        qt5LinkModuleDir "$module" "share"
+    done
+}
+
+preConfigureHooks+=(_qtLinkAllModules)
diff --git a/pkgs/development/libraries/qt-5/5.6/setup-hook.sh b/pkgs/development/libraries/qt-5/5.6/setup-hook.sh
index 212ac903eeeb7..e41433c113861 100644
--- a/pkgs/development/libraries/qt-5/5.6/setup-hook.sh
+++ b/pkgs/development/libraries/qt-5/5.6/setup-hook.sh
@@ -1,7 +1,2 @@
-qt5LinkModuleDir @out@ "lib"
-
-qt5LinkModuleDir @dev@ "bin"
-qt5LinkModuleDir @dev@ "include"
-qt5LinkModuleDir @dev@ "lib"
-qt5LinkModuleDir @dev@ "mkspecs"
-qt5LinkModuleDir @dev@ "share"
+NIX_QT5_MODULES="${NIX_QT5_MODULES}${NIX_QT5_MODULES:+:}@out@"
+NIX_QT5_MODULES_DEV="${NIX_QT5_MODULES_DEV}${NIX_QT5_MODULES_DEV:+:}@dev@"
-- 
cgit 1.4.1