diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-04-09 10:49:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-09 10:49:09 -0400 |
| commit | 55e82502a5da1d26e351e81f4a9efa2e658cf67b (patch) | |
| tree | 5f12b8dc1a857e2822adf9ee7f12efe86e01bfb1 /pkgs | |
| parent | 4e7eeb5aa969cf60cf67c592304a45df84d6712a (diff) | |
| parent | f0db4de598c077c2a711ccb7894e518b3035a5f8 (diff) | |
| download | nixlib-55e82502a5da1d26e351e81f4a9efa2e658cf67b.tar nixlib-55e82502a5da1d26e351e81f4a9efa2e658cf67b.tar.gz nixlib-55e82502a5da1d26e351e81f4a9efa2e658cf67b.tar.bz2 nixlib-55e82502a5da1d26e351e81f4a9efa2e658cf67b.tar.lz nixlib-55e82502a5da1d26e351e81f4a9efa2e658cf67b.tar.xz nixlib-55e82502a5da1d26e351e81f4a9efa2e658cf67b.tar.zst nixlib-55e82502a5da1d26e351e81f4a9efa2e658cf67b.zip | |
Merge pull request #84689 from matthewbauer/fix-77290
kwallet-pam: just provide plugin path for qtbase
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/plasma-5/kwallet-pam.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/desktops/plasma-5/kwallet-pam.nix b/pkgs/desktops/plasma-5/kwallet-pam.nix index 7ddd6e2abb77..590c523e9d74 100644 --- a/pkgs/desktops/plasma-5/kwallet-pam.nix +++ b/pkgs/desktops/plasma-5/kwallet-pam.nix @@ -7,8 +7,15 @@ mkDerivation { postPatch = '' sed -i pam_kwallet_init -e "s|socat|${lib.getBin socat}/bin/socat|" ''; + + # We get a crash when QT_PLUGIN_PATH is more than 1000 characters. + # pam_kwallet_init passes its environment to kwalletd5, but + # wrapQtApps gives our environment a huge QT_PLUGIN_PATH value. We + # are able to unset it here since kwalletd5 will have its own + # QT_PLUGIN_PATH. postFixup = '' - wrapQtApp $out/libexec/pam_kwallet_init + wrapProgram $out/libexec/pam_kwallet_init --unset QT_PLUGIN_PATH ''; + dontWrapQtApps = true; } |