nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-11 08:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
642ee7a77f
nixpkgs/pkgs/development/libraries/qt-5/5.4/0014-mkspecs-libgl.patch

18 lines
812 B
Diff
Raw Normal View History

qt5: embed path to mesa (libGL) in Qt mkspecs file Fixes this problem, when building apps in QtCreator: ...(compile output window) g++ -Wl,-rpath,/nix/store/1w7h7p6s2srfw2ady90k7072991lrnpp-qtbase-5.4.2/lib \ -o qt-test3 main.o mainwindow.o moc_mainwindow.o \ -L/nix/store/1w7h7p6s2srfw2ady90k7072991lrnpp-qtbase-5.4.2/lib \ -lQt5Widgets -lQt5Gui -lQt5Core -lGL -lpthread /nix/store/b8qhjrwf8sf9ggkjxqqav7f1m6w83bh0-binutils-2.23.1/bin/ld: cannot find -lGL collect2: error: ld returned 1 exit status mesa is already in the closure of Qt, so there is no size increase. The patch is copied into both qt-5.3 and qt-5.4 directories, like other patches are. Note that programs still can _run_ against a different libGL (e.g. one provided by nvidia) by configuring the dynamic linker. For instance, NixOS sets the LD_LIBRARY_PATH environment variable to /run/opengl-driver/lib/, meaning that whatever libGL is found there will be used instead of the default (mesa).
2015-08-23 10:39:44 +00:00
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
qt54: add missing mesa include dir Try to build e.g. the Qt5 Camera Example[1] and see that qmake fails to find <GL/gl.h>. 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".)
2015-09-27 20:08:39 +00:00
@@ -12,8 +12,8 @@
QMAKE_LIBDIR =
qt5: embed path to mesa (libGL) in Qt mkspecs file Fixes this problem, when building apps in QtCreator: ...(compile output window) g++ -Wl,-rpath,/nix/store/1w7h7p6s2srfw2ady90k7072991lrnpp-qtbase-5.4.2/lib \ -o qt-test3 main.o mainwindow.o moc_mainwindow.o \ -L/nix/store/1w7h7p6s2srfw2ady90k7072991lrnpp-qtbase-5.4.2/lib \ -lQt5Widgets -lQt5Gui -lQt5Core -lGL -lpthread /nix/store/b8qhjrwf8sf9ggkjxqqav7f1m6w83bh0-binutils-2.23.1/bin/ld: cannot find -lGL collect2: error: ld returned 1 exit status mesa is already in the closure of Qt, so there is no size increase. The patch is copied into both qt-5.3 and qt-5.4 directories, like other patches are. Note that programs still can _run_ against a different libGL (e.g. one provided by nvidia) by configuring the dynamic linker. For instance, NixOS sets the LD_LIBRARY_PATH environment variable to /run/opengl-driver/lib/, meaning that whatever libGL is found there will be used instead of the default (mesa).
2015-08-23 10:39:44 +00:00
QMAKE_INCDIR_X11 =
QMAKE_LIBDIR_X11 =
qt54: add missing mesa include dir Try to build e.g. the Qt5 Camera Example[1] and see that qmake fails to find <GL/gl.h>. 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".)
2015-09-27 20:08:39 +00:00
-QMAKE_INCDIR_OPENGL =
qt5: embed path to mesa (libGL) in Qt mkspecs file Fixes this problem, when building apps in QtCreator: ...(compile output window) g++ -Wl,-rpath,/nix/store/1w7h7p6s2srfw2ady90k7072991lrnpp-qtbase-5.4.2/lib \ -o qt-test3 main.o mainwindow.o moc_mainwindow.o \ -L/nix/store/1w7h7p6s2srfw2ady90k7072991lrnpp-qtbase-5.4.2/lib \ -lQt5Widgets -lQt5Gui -lQt5Core -lGL -lpthread /nix/store/b8qhjrwf8sf9ggkjxqqav7f1m6w83bh0-binutils-2.23.1/bin/ld: cannot find -lGL collect2: error: ld returned 1 exit status mesa is already in the closure of Qt, so there is no size increase. The patch is copied into both qt-5.3 and qt-5.4 directories, like other patches are. Note that programs still can _run_ against a different libGL (e.g. one provided by nvidia) by configuring the dynamic linker. For instance, NixOS sets the LD_LIBRARY_PATH environment variable to /run/opengl-driver/lib/, meaning that whatever libGL is found there will be used instead of the default (mesa).
2015-08-23 10:39:44 +00:00
-QMAKE_LIBDIR_OPENGL =
qt54: add missing mesa include dir Try to build e.g. the Qt5 Camera Example[1] and see that qmake fails to find <GL/gl.h>. 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".)
2015-09-27 20:08:39 +00:00
+QMAKE_INCDIR_OPENGL = @mesa@/include
qt5: embed path to mesa (libGL) in Qt mkspecs file Fixes this problem, when building apps in QtCreator: ...(compile output window) g++ -Wl,-rpath,/nix/store/1w7h7p6s2srfw2ady90k7072991lrnpp-qtbase-5.4.2/lib \ -o qt-test3 main.o mainwindow.o moc_mainwindow.o \ -L/nix/store/1w7h7p6s2srfw2ady90k7072991lrnpp-qtbase-5.4.2/lib \ -lQt5Widgets -lQt5Gui -lQt5Core -lGL -lpthread /nix/store/b8qhjrwf8sf9ggkjxqqav7f1m6w83bh0-binutils-2.23.1/bin/ld: cannot find -lGL collect2: error: ld returned 1 exit status mesa is already in the closure of Qt, so there is no size increase. The patch is copied into both qt-5.3 and qt-5.4 directories, like other patches are. Note that programs still can _run_ against a different libGL (e.g. one provided by nvidia) by configuring the dynamic linker. For instance, NixOS sets the LD_LIBRARY_PATH environment variable to /run/opengl-driver/lib/, meaning that whatever libGL is found there will be used instead of the default (mesa).
2015-08-23 10:39:44 +00:00
+QMAKE_LIBDIR_OPENGL = @mesa@/lib
QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
QMAKE_INCDIR_EGL =
Reference in New Issue Copy Permalink