mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-19 17:39:34 +00:00
qt58: ignore NIX_PROFILES environment variable
This commit is contained in:
parent
12c981d4b7
commit
6169bd98f5
pkgs/development/libraries/qt-5
|
@ -1,22 +0,0 @@
|
||||||
Index: qtbase-opensource-src-5.6.0/src/corelib/kernel/qcoreapplication.cpp
|
|
||||||
===================================================================
|
|
||||||
--- qtbase-opensource-src-5.6.0.orig/src/corelib/kernel/qcoreapplication.cpp
|
|
||||||
+++ qtbase-opensource-src-5.6.0/src/corelib/kernel/qcoreapplication.cpp
|
|
||||||
@@ -2533,7 +2533,17 @@ QStringList QCoreApplication::libraryPat
|
|
||||||
QStringList *app_libpaths = new QStringList;
|
|
||||||
coreappdata()->app_libpaths.reset(app_libpaths);
|
|
||||||
|
|
||||||
+ // Add library paths derived from NIX_PROFILES.
|
|
||||||
+ const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' ');
|
|
||||||
+ const QString plugindir = QString::fromLatin1("/lib/qt5/plugins");
|
|
||||||
+ Q_FOREACH (const QByteArray &profile, profiles) {
|
|
||||||
+ if (!profile.isEmpty()) {
|
|
||||||
+ app_libpaths->append(QFile::decodeName(profile) + plugindir);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH");
|
|
||||||
+ qunsetenv("QT_PLUGIN_PATH"); // do not propagate to child processes
|
|
||||||
if (!libPathEnv.isEmpty()) {
|
|
||||||
QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts);
|
|
||||||
for (QStringList::const_iterator it = paths.constBegin(); it != paths.constEnd(); ++it) {
|
|
|
@ -4,6 +4,5 @@ dlopen-libXcursor.patch
|
||||||
dlopen-openssl.patch
|
dlopen-openssl.patch
|
||||||
dlopen-dbus.patch
|
dlopen-dbus.patch
|
||||||
xdg-config-dirs.patch
|
xdg-config-dirs.patch
|
||||||
nix-profiles-library-paths.patch
|
|
||||||
compose-search-path.patch
|
compose-search-path.patch
|
||||||
libressl.patch
|
libressl.patch
|
||||||
|
|
|
@ -1,22 +0,0 @@
|
||||||
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,7 +2476,17 @@ QStringList QCoreApplication::libraryPat
|
|
||||||
QStringList *app_libpaths = new QStringList;
|
|
||||||
coreappdata()->app_libpaths.reset(app_libpaths);
|
|
||||||
|
|
||||||
+ // Add library paths derived from NIX_PROFILES.
|
|
||||||
+ const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' ');
|
|
||||||
+ const QString plugindir = QString::fromLatin1("/lib/qt5/plugins");
|
|
||||||
+ for (const QByteArray &profile: profiles) {
|
|
||||||
+ if (!profile.isEmpty()) {
|
|
||||||
+ app_libpaths->append(QFile::decodeName(profile) + plugindir);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH");
|
|
||||||
+ qunsetenv("QT_PLUGIN_PATH"); // do not propagate to child processes
|
|
||||||
if (!libPathEnv.isEmpty()) {
|
|
||||||
QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts);
|
|
||||||
for (QStringList::const_iterator it = paths.constBegin(); it != paths.constEnd(); ++it) {
|
|
|
@ -4,7 +4,6 @@ dlopen-libXcursor.patch
|
||||||
dlopen-openssl.patch
|
dlopen-openssl.patch
|
||||||
dlopen-dbus.patch
|
dlopen-dbus.patch
|
||||||
xdg-config-dirs.patch
|
xdg-config-dirs.patch
|
||||||
nix-profiles-library-paths.patch
|
|
||||||
compose-search-path.patch
|
compose-search-path.patch
|
||||||
libressl.patch
|
libressl.patch
|
||||||
qpa-plugin-path.patch
|
qpa-plugin-path.patch
|
||||||
|
|
Loading…
Reference in a new issue