From 52703c427ebbd561695106d4ffb7558dead8f503 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Fri, 14 Apr 2023 21:56:54 +0800
Subject: [PATCH] qt6: move mkspecs/modules to dev output

---
 pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh | 7 +++++--
 pkgs/development/libraries/qt-6/modules/qtbase.nix         | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh
index 38a0a1d0530c..b9081e16a280 100644
--- a/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh
+++ b/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh
@@ -54,9 +54,12 @@ else # Only set up Qt once.
         dontPatchMkspecs=1
 
         local lib="${!outputLib}"
+        local dev="${!outputDev}"
 
-        if [ -d "$lib/mkspecs/modules" ]; then
-            fixQtModulePaths "$lib/mkspecs/modules"
+        moveToOutput "mkspecs/modules" "$dev"
+
+        if [ -d "$dev/mkspecs/modules" ]; then
+            fixQtModulePaths "$dev/mkspecs/modules"
         fi
 
         if [ -d "$lib/mkspecs" ]; then
diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix
index d5892d9798d9..1f8b346f79c5 100644
--- a/pkgs/development/libraries/qt-6/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix
@@ -244,7 +244,8 @@ stdenv.mkDerivation rec {
   moveToDev = false;
 
   postFixup = ''
-    fixQtModulePaths  "$out/mkspecs/modules"
+    moveToOutput      "mkspecs/modules" "$dev"
+    fixQtModulePaths  "$dev/mkspecs/modules"
     fixQtBuiltinPaths "$out" '*.pr?'
   '';