diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2018-03-17 18:51:48 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2018-03-26 14:01:49 +0300 |
| commit | f362cf23d791c417e6fb33b69fae039215a88077 (patch) | |
| tree | 12e1ff44e0dd62d327b72fcedc22f44018cb455f | |
| parent | 6bf1421f13d667c2997b67728cf777c6a70716a5 (diff) | |
| download | nixlib-f362cf23d791c417e6fb33b69fae039215a88077.tar nixlib-f362cf23d791c417e6fb33b69fae039215a88077.tar.gz nixlib-f362cf23d791c417e6fb33b69fae039215a88077.tar.bz2 nixlib-f362cf23d791c417e6fb33b69fae039215a88077.tar.lz nixlib-f362cf23d791c417e6fb33b69fae039215a88077.tar.xz nixlib-f362cf23d791c417e6fb33b69fae039215a88077.tar.zst nixlib-f362cf23d791c417e6fb33b69fae039215a88077.zip | |
qt4: remove OpenGL absolute path patch
In resulting derivation there's no mention of this path anyway (checked with grep).
| -rw-r--r-- | pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff b/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff index 0f5cf2b79c96..4c64e9e26e30 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff +++ b/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff @@ -59,32 +59,6 @@ index 6b42d1e..f88b628 100644 lib.setLoadHints(QLibrary::ImprovedSearchHeuristics); if (!lib.load()) return; -diff --git a/src/plugins/platforms/xcb/qglxintegration.cpp b/src/plugins/platforms/xcb/qglxintegration.cpp -index 229d6f9..c122bf3 100644 ---- a/src/plugins/platforms/xcb/qglxintegration.cpp -+++ b/src/plugins/platforms/xcb/qglxintegration.cpp -@@ -136,7 +136,7 @@ void* QGLXContext::getProcAddress(const QString& procName) - { - extern const QString qt_gl_library_name(); - // QLibrary lib(qt_gl_library_name()); -- QLibrary lib(QLatin1String("GL")); -+ QLibrary lib(QLatin1String("@openglDriver@/lib/libGL")); - glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); - } - } -diff --git a/src/plugins/platforms/xlib/qglxintegration.cpp b/src/plugins/platforms/xlib/qglxintegration.cpp -index 2467247..a2441d4 100644 ---- a/src/plugins/platforms/xlib/qglxintegration.cpp -+++ b/src/plugins/platforms/xlib/qglxintegration.cpp -@@ -137,7 +137,7 @@ void* QGLXContext::getProcAddress(const QString& procName) - { - extern const QString qt_gl_library_name(); - // QLibrary lib(qt_gl_library_name()); -- QLibrary lib(QLatin1String("GL")); -+ QLibrary lib(QLatin1String("@openglDriver@/lib/libGL")); - glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); - } - } diff --git a/src/plugins/platforms/xlib/qxlibstatic.cpp b/src/plugins/platforms/xlib/qxlibstatic.cpp index f8f3d69..d63c5bc 100644 --- a/src/plugins/platforms/xlib/qxlibstatic.cpp |