summary refs log tree commit diff
path: root/pkgs/development/libraries/qt-6/modules/qtbase.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/libraries/qt-6/modules/qtbase.nix')
-rw-r--r--pkgs/development/libraries/qt-6/modules/qtbase.nix14
1 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix
index e71b0a7613d..3a4e6d8c890 100644
--- a/pkgs/development/libraries/qt-6/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix
@@ -233,10 +233,6 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  postInstall = ''
-    moveToOutput "mkspecs" "$dev"
-  '';
-
   devTools = [
     "libexec/moc"
     "libexec/rcc"
@@ -264,10 +260,12 @@ stdenv.mkDerivation rec {
   ];
 
   postFixup = ''
-    # Don't retain build-time dependencies like gdb.
-    sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri
-    fixQtModulePaths "''${!outputDev}/mkspecs/modules"
-    fixQtBuiltinPaths "''${!outputDev}" '*.pr?'
+    moveToOutput "mkspecs"   "$dev"
+    moveToOutput "modules"   "$dev"
+    moveToOutput "lib/*.prl" "$dev"
+
+    fixQtModulePaths  "$dev/mkspecs/modules"
+    fixQtBuiltinPaths "$dev" '*.pr?'
 
     # Move development tools to $dev
     moveQtDevTools