Merge staging-next into staging

2019-08-14 13:46:33 +02:00
parent a6055b7d87 8d56f2472e
commit cff9e6429a
356 changed files with 10426 additions and 11723 deletions
@@ -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/"
          ''
    );