diff options
| author | Nick Cao <nickcao@nichi.co> | 2023-04-11 13:58:02 +0800 |
|---|---|---|
| committer | Nick Cao <nickcao@nichi.co> | 2023-04-11 15:40:56 +0800 |
| commit | 1cf3cca8c020583490f83d6b2560f30c9c1c07fa (patch) | |
| tree | 9dd6743f038c881b120ea7c922956f24dc2a8a7b | |
| parent | bf30644a3d9d5aeb6b4c145bbb2639d454484069 (diff) | |
| download | nixpkgs-1cf3cca8c020583490f83d6b2560f30c9c1c07fa.tar nixpkgs-1cf3cca8c020583490f83d6b2560f30c9c1c07fa.tar.gz nixpkgs-1cf3cca8c020583490f83d6b2560f30c9c1c07fa.tar.bz2 nixpkgs-1cf3cca8c020583490f83d6b2560f30c9c1c07fa.tar.lz nixpkgs-1cf3cca8c020583490f83d6b2560f30c9c1c07fa.tar.xz nixpkgs-1cf3cca8c020583490f83d6b2560f30c9c1c07fa.tar.zst nixpkgs-1cf3cca8c020583490f83d6b2560f30c9c1c07fa.zip | |
qt6: move all qmake related files to dev output
| -rw-r--r-- | pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh | 8 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-6/modules/qtbase.nix | 14 |
2 files changed, 11 insertions, 11 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 613b42fc97e..16d9f31dbad 100644 --- a/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh +++ b/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh @@ -58,7 +58,9 @@ else # Only set up Qt once. local doc="${!outputDoc}" local lib="${!outputLib}" - moveToOutput "mkspecs" "$dev" + moveToOutput "mkspecs" "$dev" + moveToOutput "modules" "$dev" + moveToOutput "lib/*.prl" "$dev" if [ -d "$dev/mkspecs/modules" ]; then fixQtModulePaths "$dev/mkspecs/modules" @@ -68,8 +70,8 @@ else # Only set up Qt once. fixQtBuiltinPaths "$dev/mkspecs" '*.pr?' fi - if [ -d "$lib" ]; then - fixQtBuiltinPaths "$lib" '*.pr?' + if [ -d "$dev/lib" ]; then + fixQtBuiltinPaths "$dev/lib" '*.pr?' fi } if [ -z "${dontPatchMkspecs-}" ]; then 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 |