Merge pull request #299166 from hrdinka/qtpass-4.0.0

qtpass: 1.3.2 -> 1.4.0

Changed files
+9 -20
pkgs
applications
misc
qtpass
+9 -20
pkgs/applications/misc/qtpass/default.nix
···
-
{ 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 = ''
···
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;