From 583845d00bae13ae9a889732bc3a783393c7151a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 27 Sep 2015 22:08:39 +0200 Subject: [PATCH] qt54: add missing mesa include dir Try to build e.g. the Qt5 Camera Example[1] and see that qmake fails to find . This fixes it. [1] http://doc.qt.io/qt-5/qtmultimediawidgets-camera-example.html (Although since nixpkgs qtcreator still lacks 'examples', we have to download the sources manually and use "qmake && make".) --- .../development/libraries/qt-5/5.4/0014-mkspecs-libgl.patch | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.4/0014-mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.4/0014-mkspecs-libgl.patch index 94a031d1257..1fc4bbd6076 100644 --- a/pkgs/development/libraries/qt-5/5.4/0014-mkspecs-libgl.patch +++ b/pkgs/development/libraries/qt-5/5.4/0014-mkspecs-libgl.patch @@ -4,11 +4,13 @@ Author: Bjørn Forsman 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 -@@ -13,7 +13,7 @@ +@@ -12,8 +12,8 @@ + QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = - QMAKE_INCDIR_OPENGL = +-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