Merge pull request #84689 from matthewbauer/fix-77290

kwallet-pam: just provide plugin path for qtbase
This commit is contained in:
Matthew Bauer 2020-04-09 10:49:09 -04:00 committed by GitHub
commit 55e82502a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -7,8 +7,15 @@ mkDerivation {
postPatch = '' postPatch = ''
sed -i pam_kwallet_init -e "s|socat|${lib.getBin socat}/bin/socat|" 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 = '' postFixup = ''
wrapQtApp $out/libexec/pam_kwallet_init wrapProgram $out/libexec/pam_kwallet_init --unset QT_PLUGIN_PATH
''; '';
dontWrapQtApps = true; dontWrapQtApps = true;
} }