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

keepassxc: 2.5.4 -> 2.6.0

Browse Source
This commit is contained in:
claudiiii 2020-07-08 17:14:58 +02:00
parent fa535b5314
commit 78e68699c4
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/misc/keepassx/community.nix
View File

@ -6,6 +6,7 @@
, qttools , qttools
, darwin , darwin
, asciidoctor
, curl , curl
, glibcLocales , glibcLocales
, libXi , libXi
@ -39,13 +40,13 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "keepassxc"; pname = "keepassxc";
version = "2.5.4"; version = "2.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "keepassxreboot"; owner = "keepassxreboot";
repo = "keepassxc"; repo = "keepassxc";
rev = version; rev = version;
sha256 = "1xih9q1pxszalc0l29fmjxwn1vrrrrbnhc8gmi8brw5sclhbs6bh"; sha256 = "0yi6kxnsrqirjn6hxhwym2krzf86qxf3kc6bfpkmiaggnd2kqpkp";
}; };
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [ NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [
@ -63,11 +64,6 @@ stdenv.mkDerivation rec {
patches = [ patches = [
./darwin.patch ./darwin.patch
# use wl-copy on Wayland - can be dropped with the next version update
(fetchpatch {
url = "https://github.com/keepassxreboot/keepassxc/commit/6128e5d58294f26411160f44da91087ebe7f4b07.patch";
sha256 = "16q0h7kijqjdbskmk4ar6p3g8vcxr0bq1zrlq2bk16pk10nv4bh1";
})
]; ];
cmakeFlags = [ cmakeFlags = [
@ -97,6 +93,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake wrapQtAppsHook qttools ]; nativeBuildInputs = [ cmake wrapQtAppsHook qttools ];
buildInputs = [ buildInputs = [
asciidoctor
curl curl
glibcLocales glibcLocales
libXi libXi