keepassx-community: 2.1.4 -> 2.2.0
This commit is contained in:
parent
8d8fdce611
commit
7df83abe85
@ -1,5 +1,5 @@
|
|||||||
{ stdenv, fetchFromGitHub, fetchpatch,
|
{ stdenv, fetchFromGitHub, fetchpatch,
|
||||||
cmake, libgcrypt, zlib, libmicrohttpd, libXtst, qtbase, qttools, libgpgerror
|
cmake, libgcrypt, zlib, libmicrohttpd, libXtst, qtbase, qttools, libgpgerror, glibcLocales
|
||||||
, withKeePassHTTP ? true
|
, withKeePassHTTP ? true
|
||||||
}:
|
}:
|
||||||
|
|
||||||
@ -7,25 +7,24 @@ with stdenv.lib;
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "keepassx-community-${version}";
|
name = "keepassx-community-${version}";
|
||||||
version = "2.1.4";
|
version = "2.2.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "keepassxreboot";
|
owner = "keepassxreboot";
|
||||||
repo = "keepassxc";
|
repo = "keepassxc";
|
||||||
rev = "${version}";
|
rev = "${version}";
|
||||||
sha256 = "1znnw2xpv58x0rbpmm4y662377mbmcilhf8mhhjsz8vhahms33a8";
|
sha256 = "0gg75mjy2p7lyh8nnivmyn7bjp1zyx26zm8s1fak7d2di2r0mnjc";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
cmakeFlags = [ "-DWITH_GUI_TESTS=ON" ] ++ (optional withKeePassHTTP "-DWITH_XC_HTTP=ON");
|
||||||
(fetchpatch { # qt 4.9
|
|
||||||
url = "https://github.com/keepassxreboot/keepassxc/commit/2b6059dee3a95591d787e8b8c931cd68c059d43f.patch";
|
|
||||||
sha256 = "1v140z358rk75f7wsqawpai3x8v8qcqalnv9r0l1d4p1gxm1j766";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
cmakeFlags = optional (withKeePassHTTP) [ "-DWITH_XC_HTTP=ON" ];
|
doCheck = true;
|
||||||
|
checkPhase = ''
|
||||||
|
export LC_ALL="en_US.UTF-8"
|
||||||
|
make test ARGS+="-E testgui --output-on-failure"
|
||||||
|
'';
|
||||||
|
|
||||||
buildInputs = [ cmake libgcrypt zlib qtbase qttools libXtst libmicrohttpd libgpgerror ];
|
buildInputs = [ cmake libgcrypt zlib qtbase qttools libXtst libmicrohttpd libgpgerror glibcLocales ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Fork of the keepassX password-manager with additional http-interface to allow browser-integration an use with plugins such as PasslFox (https://github.com/pfn/passifox). See also keepassX2.";
|
description = "Fork of the keepassX password-manager with additional http-interface to allow browser-integration an use with plugins such as PasslFox (https://github.com/pfn/passifox). See also keepassX2.";
|
||||||
|
Loading…
Reference in New Issue
Block a user