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

qt55: apply mkspecs-libgl.patch from qt54

Browse Source
This commit is contained in:
Bjørn Forsman 2015-09-28 10:05:45 +02:00
parent 583845d00b
commit 3dec100104
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/libraries/qt-5/5.5/qtbase/0014-mkspecs-libgl.patch Normal file
View File

@ -0,0 +1,17 @@
Ensure Qt knows where libGL is.
Author: Bjørn Forsman <bjorn.forsman@gmail.com>
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
--- qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.conf 2014-09-11 12:48:07.000000000 +0200
+++ qt-everywhere-opensource-src-5.3.2/qtbase/mkspecs/common/linux.conf 2015-08-23 13:03:30.617473019 +0200
@@ -12,8 +12,8 @@
QMAKE_LIBDIR =
QMAKE_INCDIR_X11 =
QMAKE_LIBDIR_X11 =
-QMAKE_INCDIR_OPENGL =
-QMAKE_LIBDIR_OPENGL =
+QMAKE_INCDIR_OPENGL = @mesa@/include
+QMAKE_LIBDIR_OPENGL = @mesa@/lib
QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
QMAKE_INCDIR_EGL =

7
pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
View File

@ -83,12 +83,17 @@ stdenv.mkDerivation {
}; };
xdg-config-dirs = ./0008-xdg-config-dirs.patch; xdg-config-dirs = ./0008-xdg-config-dirs.patch;
decrypt-ssl-traffic = ./0009-decrypt-ssl-traffic.patch; decrypt-ssl-traffic = ./0009-decrypt-ssl-traffic.patch;
mkspecs-libgl = substituteAll {
src = ./0014-mkspecs-libgl.patch;
inherit mesa;
};
in [ in [
dlopen-resolv dlopen-gl tzdir dlopen-libXcursor dlopen-openssl dlopen-resolv dlopen-gl tzdir dlopen-libXcursor dlopen-openssl
dlopen-dbus xdg-config-dirs dlopen-dbus xdg-config-dirs
] ]
++ optional gtkStyle dlopen-gtkstyle ++ optional gtkStyle dlopen-gtkstyle
++ optional decryptSslTraffic decrypt-ssl-traffic; ++ optional decryptSslTraffic decrypt-ssl-traffic
++ optional mesaSupported mkspecs-libgl;
preConfigure = '' preConfigure = ''
export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$PWD/qttools/lib:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$PWD/qttools/lib:$LD_LIBRARY_PATH"