public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "qt58: ignore NIX_PROFILES environment variable"

Browse Source 
This reverts commit 6169bd98f51429d7da4f2fc296357d8e6d828751.
This commit is contained in:
Thomas Tuegel 2017-05-10 15:57:24 -05:00
parent e8880627e8
commit 88a5082edf
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
4 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch Normal file
View File

@ -0,0 +1,20 @@
Index: qtbase-opensource-src-5.6.2/src/corelib/kernel/qcoreapplication.cpp
===================================================================
--- qtbase-opensource-src-5.6.2.orig/src/corelib/kernel/qcoreapplication.cpp
+++ qtbase-opensource-src-5.6.2/src/corelib/kernel/qcoreapplication.cpp
@@ -2533,6 +2533,15 @@ 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");
if (!libPathEnv.isEmpty()) {
QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts);

1
pkgs/development/libraries/qt-5/5.6/qtbase/series
View File

@ -4,5 +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

22
pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch Normal file
View File

@ -0,0 +1,22 @@
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) {

1
pkgs/development/libraries/qt-5/5.8/qtbase/series
View File

@ -2,6 +2,7 @@ dlopen-resolv.patch
tzdir.patch tzdir.patch
dlopen-libXcursor.patch dlopen-libXcursor.patch
xdg-config-dirs.patch xdg-config-dirs.patch
nix-profiles-library-paths.patch
libressl.patch libressl.patch
qpa-plugin-path.patch qpa-plugin-path.patch
dlopen-gl.patch dlopen-gl.patch