diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-03-31 14:33:09 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-03-31 14:36:30 -0500 |
| commit | 7f336a45132815d0968f2b45c5713c627a218062 (patch) | |
| tree | 2ffb308cc51050031287ea9deb19a45b90ce03a9 /pkgs | |
| parent | f752424924478722229751fa3302de52fdbe214a (diff) | |
| download | nixpkgs-7f336a45132815d0968f2b45c5713c627a218062.tar nixpkgs-7f336a45132815d0968f2b45c5713c627a218062.tar.gz nixpkgs-7f336a45132815d0968f2b45c5713c627a218062.tar.bz2 nixpkgs-7f336a45132815d0968f2b45c5713c627a218062.tar.lz nixpkgs-7f336a45132815d0968f2b45c5713c627a218062.tar.xz nixpkgs-7f336a45132815d0968f2b45c5713c627a218062.tar.zst nixpkgs-7f336a45132815d0968f2b45c5713c627a218062.zip | |
qtbase: unset QT_PLUGIN_PATH after loading
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.5/qtbase/nix-profiles-library-paths.patch | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/nix-profiles-library-paths.patch index 470526b1dcd..d20767a38e5 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/nix-profiles-library-paths.patch +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/nix-profiles-library-paths.patch @@ -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/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. + const QByteArray nixProfilesEnv = qgetenv("NIX_PROFILES"); |