diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-12-21 22:03:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-21 22:03:14 -0500 |
| commit | 9f99517f62ff12e13b1a329bdfa546ef256f098f (patch) | |
| tree | 6e04c7017836a292356153a13c5a35092858f205 /pkgs | |
| parent | fd4dd7ea1eec905cc0c772116ee387ea1c90f38b (diff) | |
| parent | 213e1298251020469de144b0e0834cda4d0abb4a (diff) | |
| download | nixpkgs-9f99517f62ff12e13b1a329bdfa546ef256f098f.tar nixpkgs-9f99517f62ff12e13b1a329bdfa546ef256f098f.tar.gz nixpkgs-9f99517f62ff12e13b1a329bdfa546ef256f098f.tar.bz2 nixpkgs-9f99517f62ff12e13b1a329bdfa546ef256f098f.tar.lz nixpkgs-9f99517f62ff12e13b1a329bdfa546ef256f098f.tar.xz nixpkgs-9f99517f62ff12e13b1a329bdfa546ef256f098f.tar.zst nixpkgs-9f99517f62ff12e13b1a329bdfa546ef256f098f.zip | |
Merge pull request #76113 from nh2/qtpass-dont-hardcode-pass-otp-usr-lib
qtpass: Fix /usr/lib hardcode to pass-otp.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/qtpass/default.nix | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index f185524da58..6b68071d4d0 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -1,5 +1,6 @@ { lib, mkDerivation, fetchFromGitHub , git, gnupg, pass, pwgen, qrencode +, fetchpatch , qtbase, qtsvg, qttools, qmake }: @@ -25,6 +26,16 @@ mkDerivation rec { enableParallelBuilding = true; + patches = [ + # Fix path to pass-otp plugin `/usr/lib/password-store/extensions/otp.bash` being hardcoded. + # TODO: Remove when https://github.com/IJHack/QtPass/pull/499 is merged and available. + (fetchpatch { + name = "qtpass-Dont-hardcode-pass-otp-usr-lib-path.patch"; + url = "https://github.com/IJHack/QtPass/commit/2ca9f0ec5a8d709c97a2433c5cd814040c82d4f3.patch"; + sha256 = "0ljlvqxvarrz2a4j71i66aflrxi84zirb6cg9kvygnvhvm1zbc7d"; + }) + ]; + qmakeFlags = [ # setup hook only sets QMAKE_LRELEASE, set QMAKE_LUPDATE too: "QMAKE_LUPDATE=${qttools.dev}/bin/lupdate" |