git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #76113 from nh2/qtpass-dont-hardcode-pass-otp-usr-lib

qtpass: Fix /usr/lib hardcode to pass-otp.

commit9f99517f62ff12e13b1a329bdfa546ef256f098f authorworldofpeace <worldofpeace@protonmail.ch> dateSat 21 Dec 2019, 22:03 (7 years ago) parentfd4dd7e213e129
1 file changed+11
pkgs/applications/misc/qtpass/default.nix+11
pkgs/applications/misc/qtpass/default.nix+11
@@ -1,5 +1,6 @@
11{ lib, mkDerivation, fetchFromGitHub
22, git, gnupg, pass, pwgen, qrencode
3+, fetchpatch
34, qtbase, qtsvg, qttools, qmake
45}:
56
@@ -25,6 +26,16 @@ mkDerivation rec {
2526
2627 enableParallelBuilding = true;
2728
29+ patches = [
30+ # Fix path to pass-otp plugin `/usr/lib/password-store/extensions/otp.bash` being hardcoded.
31+ # TODO: Remove when https://github.com/IJHack/QtPass/pull/499 is merged and available.
32+ (fetchpatch {
33+ name = "qtpass-Dont-hardcode-pass-otp-usr-lib-path.patch";
34+ url = "https://github.com/IJHack/QtPass/commit/2ca9f0ec5a8d709c97a2433c5cd814040c82d4f3.patch";
35+ sha256 = "0ljlvqxvarrz2a4j71i66aflrxi84zirb6cg9kvygnvhvm1zbc7d";
36+ })
37+ ];
38+
2839 qmakeFlags = [
2940 # setup hook only sets QMAKE_LRELEASE, set QMAKE_LUPDATE too:
3041 "QMAKE_LUPDATE=${qttools.dev}/bin/lupdate"