colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #299166 from hrdinka/qtpass-4.0.0

Browse Source 
qtpass: 1.3.2 -> 1.4.0
This commit is contained in:
Christoph Hrdinka 2024-03-28 09:03:28 +01:00 committed by GitHub
commit 66c8502164
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/applications/misc/qtpass/default.nix
View File

@ -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;