diff options
Diffstat (limited to 'pkgs/development/libraries/qt-5/5.8/qtbase/library-paths.patch')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.8/qtbase/library-paths.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/library-paths.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/library-paths.patch new file mode 100644 index 000000000000..38eecbe2c646 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.8/qtbase/library-paths.patch @@ -0,0 +1,20 @@ +Index: qtbase-opensource-src-5.8.0/src/corelib/kernel/qcoreapplication.cpp +=================================================================== +--- qtbase-opensource-src-5.8.0.orig/src/corelib/kernel/qcoreapplication.cpp ++++ qtbase-opensource-src-5.8.0/src/corelib/kernel/qcoreapplication.cpp +@@ -2476,6 +2476,15 @@ QStringList QCoreApplication::libraryPat + QStringList *app_libpaths = new QStringList; + coreappdata()->app_libpaths.reset(app_libpaths); + ++ // Add library paths derived from PATH ++ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); ++ const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX); ++ for (const QString &path: paths) { ++ if (!path.isEmpty()) { ++ app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir)); ++ } ++ } ++ + const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH"); + if (!libPathEnv.isEmpty()) { + QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts); |