qtpass: 1.3.2 -> 1.4.0
Changelog: https://github.com/IJHack/QtPass/releases/tag/v1.4.0 Closes #298915
This commit is contained in:
parent
05677341df
commit
cf1e9d2cf9
|
@ -1,18 +1,17 @@
|
||||||
{ lib, mkDerivation, fetchFromGitHub
|
{ fetchFromGitHub, lib, stdenv
|
||||||
, git, gnupg, pass, pwgen, qrencode
|
, git, gnupg, pass, pwgen, qrencode
|
||||||
, fetchpatch
|
, qtbase, qtsvg, qttools, qmake, wrapQtAppsHook
|
||||||
, qtbase, qtsvg, qttools, qmake
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "qtpass";
|
pname = "qtpass";
|
||||||
version = "1.3.2";
|
version = "1.4.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "IJHack";
|
owner = "IJHack";
|
||||||
repo = "QtPass";
|
repo = "QtPass";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0748hjvhjrybi33ci3c8hcr74k9pdrf5jv8npf9hrsrmdyy1kr9x";
|
sha256 = "sha256-oKLLmsuXD2Hb2LQ4tcJP2gpR6eLaM/JzDhRcRSpUPYI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
@ -22,17 +21,7 @@ mkDerivation rec {
|
||||||
|
|
||||||
buildInputs = [ git gnupg pass qtbase qtsvg ];
|
buildInputs = [ git gnupg pass qtbase qtsvg ];
|
||||||
|
|
||||||
nativeBuildInputs = [ qmake qttools ];
|
nativeBuildInputs = [ qmake qttools wrapQtAppsHook ];
|
||||||
|
|
||||||
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";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
# HACK `propagatedSandboxProfile` does not appear to actually propagate the sandbox profile from `qt5.qtbase`
|
# HACK `propagatedSandboxProfile` does not appear to actually propagate the sandbox profile from `qt5.qtbase`
|
||||||
sandboxProfile = toString qtbase.__propagatedSandboxProfile;
|
sandboxProfile = toString qtbase.__propagatedSandboxProfile;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user