diff options
| author | Dan Peebles <pumpkin@me.com> | 2017-03-30 12:54:41 -0400 |
|---|---|---|
| committer | Dan Peebles <pumpkin@me.com> | 2017-03-30 12:54:41 -0400 |
| commit | 8b65437aae8ab4ffebc3e7f566e385c185bea0d2 (patch) | |
| tree | a07d85c9599a81f49b0447c343f8b8e7ff64e66e /pkgs/development/libraries/qt-5/5.7/qtbase/mkspecs-libgl.patch | |
| parent | 9b049849bfc385604f240157e129f7a8e3530d7f (diff) | |
| parent | f9a10601990de8eada3470eda50f7cff8277bd0e (diff) | |
| download | nixpkgs-8b65437aae8ab4ffebc3e7f566e385c185bea0d2.tar nixpkgs-8b65437aae8ab4ffebc3e7f566e385c185bea0d2.tar.gz nixpkgs-8b65437aae8ab4ffebc3e7f566e385c185bea0d2.tar.bz2 nixpkgs-8b65437aae8ab4ffebc3e7f566e385c185bea0d2.tar.lz nixpkgs-8b65437aae8ab4ffebc3e7f566e385c185bea0d2.tar.xz nixpkgs-8b65437aae8ab4ffebc3e7f566e385c185bea0d2.tar.zst nixpkgs-8b65437aae8ab4ffebc3e7f566e385c185bea0d2.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/libraries/qt-5/5.7/qtbase/mkspecs-libgl.patch')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.7/qtbase/mkspecs-libgl.patch | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/mkspecs-libgl.patch deleted file mode 100644 index fda3d3e3653..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/mkspecs-libgl.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: qtbase-opensource-src-5.5.1/mkspecs/common/linux.conf -=================================================================== ---- qtbase-opensource-src-5.5.1.orig/mkspecs/common/linux.conf -+++ qtbase-opensource-src-5.5.1/mkspecs/common/linux.conf -@@ -12,8 +12,8 @@ QMAKE_INCDIR = - QMAKE_LIBDIR = - QMAKE_INCDIR_X11 = - QMAKE_LIBDIR_X11 = --QMAKE_INCDIR_OPENGL = --QMAKE_LIBDIR_OPENGL = -+QMAKE_INCDIR_OPENGL = @mesa_inc@/include -+QMAKE_LIBDIR_OPENGL = @mesa_lib@/lib - QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL - QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL - QMAKE_INCDIR_EGL = |