pyrox.dev / nixpkgs
lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge pull request #9524 from bjornfor/qt5-mkspecs-libgl

qt5: embed path to mesa (libGL) in Qt mkspecs file

Thomas Tuegel e9a8c5a9 fc0baf0e

+34 -2
+15
pkgs/development/libraries/qt-5/5.3/0014-mkspecs-libgl.patch
··· 1 + Ensure Qt knows where libGL is. 2 + 3 + Author: Bjørn Forsman <bjorn.forsman@gmail.com> 4 + diff -uNr qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.conf qt-everywhere-opensource-src-5.3.2/qtbase/mkspecs/common/linux.conf 5 + --- qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.conf 2014-09-11 12:48:07.000000000 +0200 6 + +++ qt-everywhere-opensource-src-5.3.2/qtbase/mkspecs/common/linux.conf 2015-08-23 13:03:30.617473019 +0200 7 + @@ -13,7 +13,7 @@ 8 + QMAKE_INCDIR_X11 = 9 + QMAKE_LIBDIR_X11 = 10 + QMAKE_INCDIR_OPENGL = 11 + -QMAKE_LIBDIR_OPENGL = 12 + +QMAKE_LIBDIR_OPENGL = @mesa@/lib 13 + QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL 14 + QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL 15 + QMAKE_INCDIR_EGL =
+2 -1
pkgs/development/libraries/qt-5/5.3/default.nix
··· 81 81 (substituteAll { src = ./0011-dlopen-openssl.patch; inherit openssl; }) 82 82 (substituteAll { src = ./0012-dlopen-dbus.patch; dbus_libs = dbus; }) 83 83 ./0013-qtwebkit-glib-2.44.patch 84 - ]; 84 + ] ++ optional mesaSupported 85 + (substituteAll { src = ./0014-mkspecs-libgl.patch; inherit mesa; }); 85 86 86 87 preConfigure = '' 87 88 export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$PWD/qttools/lib:$LD_LIBRARY_PATH"
+15
pkgs/development/libraries/qt-5/5.4/0014-mkspecs-libgl.patch
··· 1 + Ensure Qt knows where libGL is. 2 + 3 + Author: Bjørn Forsman <bjorn.forsman@gmail.com> 4 + diff -uNr qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.conf qt-everywhere-opensource-src-5.3.2/qtbase/mkspecs/common/linux.conf 5 + --- qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.conf 2014-09-11 12:48:07.000000000 +0200 6 + +++ qt-everywhere-opensource-src-5.3.2/qtbase/mkspecs/common/linux.conf 2015-08-23 13:03:30.617473019 +0200 7 + @@ -13,7 +13,7 @@ 8 + QMAKE_INCDIR_X11 = 9 + QMAKE_LIBDIR_X11 = 10 + QMAKE_INCDIR_OPENGL = 11 + -QMAKE_LIBDIR_OPENGL = 12 + +QMAKE_LIBDIR_OPENGL = @mesa@/lib 13 + QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL 14 + QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL 15 + QMAKE_INCDIR_EGL =
+2 -1
pkgs/development/libraries/qt-5/5.4/qtbase.nix
··· 71 71 (substituteAll { src = ./0011-dlopen-openssl.patch; inherit openssl; }) 72 72 (substituteAll { src = ./0012-dlopen-dbus.patch; dbus_libs = dbus; }) 73 73 ./0013-xdg_config_dirs.patch 74 - ] 74 + ] ++ optional mesaSupported 75 + (substituteAll { src = ./0014-mkspecs-libgl.patch; inherit mesa; }) 75 76 ++ (optional decryptSslTraffic ./0100-ssl.patch); 76 77 77 78 preConfigure = ''