nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-22 21:04:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

qt6: move all qmake related files to dev output

Browse Source
This commit is contained in:
Nick Cao 2023-04-11 13:58:02 +08:00
parent bf30644a3d
commit 1cf3cca8c0
No known key found for this signature in database
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh
View File

@ -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

14
pkgs/development/libraries/qt-6/modules/qtbase.nix
View File

@ -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