diff options
| author | Christoph Hrdinka <c.github@hrdinka.at> | 2024-03-28 09:03:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-28 09:03:28 +0100 |
| commit | 66c8502164e8dda67bc4d458002e7202880e0145 (patch) | |
| tree | 90048a1c28d1dea19a2f6a2a4068b0eb6c741c1c | |
| parent | 6fb20db673a01cdf5affc74ce7721428ef821fa3 (diff) | |
| parent | cf1e9d2cf9a110a928b3285095cfc0c1485adf4c (diff) | |
| download | nixlib-66c8502164e8dda67bc4d458002e7202880e0145.tar nixlib-66c8502164e8dda67bc4d458002e7202880e0145.tar.gz nixlib-66c8502164e8dda67bc4d458002e7202880e0145.tar.bz2 nixlib-66c8502164e8dda67bc4d458002e7202880e0145.tar.lz nixlib-66c8502164e8dda67bc4d458002e7202880e0145.tar.xz nixlib-66c8502164e8dda67bc4d458002e7202880e0145.tar.zst nixlib-66c8502164e8dda67bc4d458002e7202880e0145.zip | |
Merge pull request #299166 from hrdinka/qtpass-4.0.0
qtpass: 1.3.2 -> 1.4.0
| -rw-r--r-- | pkgs/applications/misc/qtpass/default.nix | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index 26807bc42a1c..ae26de760ee6 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -1,18 +1,17 @@ -{ lib, mkDerivation, fetchFromGitHub +{ fetchFromGitHub, lib, stdenv , git, gnupg, pass, pwgen, qrencode -, fetchpatch -, qtbase, qtsvg, qttools, qmake +, qtbase, qtsvg, qttools, qmake, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "qtpass"; - version = "1.3.2"; + version = "1.4.0"; src = fetchFromGitHub { - owner = "IJHack"; - repo = "QtPass"; - rev = "v${version}"; - sha256 = "0748hjvhjrybi33ci3c8hcr74k9pdrf5jv8npf9hrsrmdyy1kr9x"; + owner = "IJHack"; + repo = "QtPass"; + rev = "v${version}"; + sha256 = "sha256-oKLLmsuXD2Hb2LQ4tcJP2gpR6eLaM/JzDhRcRSpUPYI="; }; postPatch = '' @@ -22,17 +21,7 @@ mkDerivation rec { buildInputs = [ git gnupg pass qtbase qtsvg ]; - nativeBuildInputs = [ qmake qttools ]; - - 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"; - }) - ]; + nativeBuildInputs = [ qmake qttools wrapQtAppsHook ]; # HACK `propagatedSandboxProfile` does not appear to actually propagate the sandbox profile from `qt5.qtbase` sandboxProfile = toString qtbase.__propagatedSandboxProfile; |