diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-04-08 19:54:06 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-04-28 05:49:34 -0500 |
commit | 6169bd98f51429d7da4f2fc296357d8e6d828751 (patch) | |
tree | 5c8991d3f86da550adc8dcdb0cdca88383570970 /pkgs | |
parent | 12c981d4b7486147f8c00a504409ac957b9511ed (diff) | |
download | nixpkgs-6169bd98f51429d7da4f2fc296357d8e6d828751.tar nixpkgs-6169bd98f51429d7da4f2fc296357d8e6d828751.tar.gz nixpkgs-6169bd98f51429d7da4f2fc296357d8e6d828751.tar.bz2 nixpkgs-6169bd98f51429d7da4f2fc296357d8e6d828751.tar.lz nixpkgs-6169bd98f51429d7da4f2fc296357d8e6d828751.tar.xz nixpkgs-6169bd98f51429d7da4f2fc296357d8e6d828751.tar.zst nixpkgs-6169bd98f51429d7da4f2fc296357d8e6d828751.zip |
qt58: ignore NIX_PROFILES environment variable
Diffstat (limited to 'pkgs')
4 files changed, 0 insertions, 46 deletions
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch deleted file mode 100644 index d454a74109a..00000000000 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch +++ /dev/null @@ -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) { diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/series b/pkgs/development/libraries/qt-5/5.6/qtbase/series index 2196d838375..9ef8c998c66 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/series +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/series @@ -4,6 +4,5 @@ dlopen-libXcursor.patch dlopen-openssl.patch dlopen-dbus.patch xdg-config-dirs.patch -nix-profiles-library-paths.patch compose-search-path.patch libressl.patch diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch deleted file mode 100644 index c5d91066d8f..00000000000 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch +++ /dev/null @@ -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) { diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/series b/pkgs/development/libraries/qt-5/5.8/qtbase/series index 72882a47942..f0b1bfa674d 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/series +++ b/pkgs/development/libraries/qt-5/5.8/qtbase/series @@ -4,7 +4,6 @@ dlopen-libXcursor.patch dlopen-openssl.patch dlopen-dbus.patch xdg-config-dirs.patch -nix-profiles-library-paths.patch compose-search-path.patch libressl.patch qpa-plugin-path.patch |