Merge pull request #170399 from chuangzhu/qtbase

qtbase: use -pthread instead of -lpthread
NixOS · May 22, 2022 · 339c5dc · 339c5dc
2 parents 85099a0 + 235c1c1
commit 339c5dc
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -116,6 +116,9 @@ stdenv.mkDerivation {
     sed -i '/PATHS.*NO_DEFAULT_PATH/ d' src/corelib/Qt5CoreMacros.cmake
     sed -i 's/NO_DEFAULT_PATH//' src/gui/Qt5GuiConfigExtras.cmake.in
     sed -i '/PATHS.*NO_DEFAULT_PATH/ d' mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+
+    # https://bugs.gentoo.org/803470
+    sed -i 's/-lpthread/-pthread/' mkspecs/common/linux.conf src/corelib/configure.json
   '' + lib.optionalString (compareVersion "5.15.0" >= 0) ''
     patchShebangs ./bin
   '' + (