cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge #219427: qt5: make overrriding with separate debug info useful

Browse source 
...into staging
This commit is contained in:
Vladimír Čunát 2023-03-25 13:27:33 +01:00
commit a53bfc01dc
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/libraries/qt-5/hooks/qmake-hook.sh
View file

@ -22,6 +22,9 @@ qmakePrePhase() {
qmakeFlags+=( "CONFIG+=release" ) qmakeFlags+=( "CONFIG+=release" )
fi fi
# do the stripping ourselves (needed for separateDebugInfo)
qmakeFlags+=( "CONFIG+=nostrip" )
qmakeFlags+=( "${qmakeFlags_orig[@]}" ) qmakeFlags+=( "${qmakeFlags_orig[@]}" )
} }
prePhases+=" qmakePrePhase" prePhases+=" qmakePrePhase"

3
pkgs/development/libraries/qt-5/modules/qtbase.nix
View file

@ -216,7 +216,8 @@ stdenv.mkDerivation (finalAttrs: {
"-shared" "-shared"
"-accessibility" "-accessibility"
"-optimized-qmake" "-optimized-qmake"
"-strip" # for separateDebugInfo
"-no-strip"
"-system-proxies" "-system-proxies"
"-pkg-config" "-pkg-config"