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

qtbase: unset QT_PLUGIN_PATH after loading

This commit is contained in:
Thomas Tuegel 2016-03-31 14:33:09 -05:00
parent f752424924
commit 7f336a4513
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/qt-5/5.5/qtbase/nix-profiles-library-paths.patch
View File

@ -2,10 +2,11 @@ Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/kernel/qcoreapplica
=================================================================== ===================================================================
--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/corelib/kernel/qcoreapplication.cpp --- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/corelib/kernel/qcoreapplication.cpp
+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/kernel/qcoreapplication.cpp +++ qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/kernel/qcoreapplication.cpp
@@ -2498,6 +2498,21 @@ QStringList QCoreApplication::libraryPat @@ -2498,6 +2498,22 @@ QStringList QCoreApplication::libraryPat
} }
} }
} }
+ qunsetenv("QT_PLUGIN_PATH"); // do not propagate to child processes
+ +
+ // Add library paths derived from NIX_PROFILES. + // Add library paths derived from NIX_PROFILES.
+ const QByteArray nixProfilesEnv = qgetenv("NIX_PROFILES"); + const QByteArray nixProfilesEnv = qgetenv("NIX_PROFILES");