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

...into staging
2023-03-25 13:27:33 +01:00 · 2023-03-25 13:27:33 +01:00 · a53bfc01dc
commit a53bfc01dc
parent 797ab14be7 b237f5b637
2 changed files with 5 additions and 1 deletions
--- a/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh
+++ b/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh
@ -22,6 +22,9 @@ qmakePrePhase() {
        qmakeFlags+=( "CONFIG+=release" )
    fi

+    # do the stripping ourselves (needed for separateDebugInfo)
+    qmakeFlags+=( "CONFIG+=nostrip" )
+
    qmakeFlags+=( "${qmakeFlags_orig[@]}" )
 }
 prePhases+=" qmakePrePhase"
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@ -216,7 +216,8 @@ stdenv.mkDerivation (finalAttrs: {
    "-shared"
    "-accessibility"
    "-optimized-qmake"
-    "-strip"
+    # for separateDebugInfo
+    "-no-strip"
    "-system-proxies"
    "-pkg-config"