public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request from averelld/pkgsi686Linux.qt5.qtbase-build-fix

Browse Source 
pkgsi686Linux.qt5.qtbase: fix build
This commit is contained in:
Thomas Tuegel 2019-08-09 09:52:37 -05:00 committed by GitHub
commit bd5ecb5337
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions

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

@ -146,6 +146,11 @@ stdenv.mkDerivation {
sed -i mkspecs/common/linux.conf \ sed -i mkspecs/common/linux.conf \
-e "/^QMAKE_INCDIR_OPENGL/ s|$|${libGL.dev or libGL}/include|" \ -e "/^QMAKE_INCDIR_OPENGL/ s|$|${libGL.dev or libGL}/include|" \
-e "/^QMAKE_LIBDIR_OPENGL/ s|$|${libGL.out}/lib|" -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/"
'' ''
); );