From 658ffb06d6e15d508c42a3588470c83eff7d5982 Mon Sep 17 00:00:00 2001 From: Averell Dalton Date: Thu, 8 Aug 2019 18:33:53 +0200 Subject: [PATCH] pkgsi686Linux.qt5.qtbase: fix build --- pkgs/development/libraries/qt-5/modules/qtbase.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 458946b803d2..2c300d1c2f16 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -146,6 +146,11 @@ stdenv.mkDerivation { sed -i mkspecs/common/linux.conf \ -e "/^QMAKE_INCDIR_OPENGL/ s|$|${libGL.dev or libGL}/include|" \ -e "/^QMAKE_LIBDIR_OPENGL/ s|$|${libGL.out}/lib|" + '' + + lib.optionalString (stdenv.hostPlatform.isx86_32 && stdenv.cc.isGNU) + '' + sed -i mkspecs/common/gcc-base-unix.conf \ + -e "/^QMAKE_LFLAGS_SHLIB/ s/-shared/-shared -static-libgcc/" '' );