keepassxc: 2.6.2 -> 2.6.3

This commit is contained in:
claudiiii 2021-01-18 17:32:28 +01:00
parent e51b4aa2ec
commit ef0419f06b

View File

@ -40,13 +40,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "keepassxc";
version = "2.6.2";
version = "2.6.3";
src = fetchFromGitHub {
owner = "keepassxreboot";
repo = "keepassxc";
rev = version;
sha256 = "032dzywvwpclhsl3n1pq2m9gyxqpg0gkci6axbvbs7bn82wznc4h";
sha256 = "1jd2mvafyn095crfs2hnfprqiy8yqsvfybwbjq8n0agapnz4bl5h";
};
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang [
@ -55,11 +55,6 @@ stdenv.mkDerivation rec {
"-D__BIG_ENDIAN__=${if stdenv.isBigEndian then "1" else "0"}"
];
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace CMakeLists.txt \
--replace "/usr/local/bin" "../bin" \
--replace "/usr/local/share/man" "../share/man"
'';
NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib";
patches = [
@ -83,14 +78,18 @@ stdenv.mkDerivation rec {
doCheck = true;
checkPhase = ''
runHook preCheck
export LC_ALL="en_US.UTF-8"
export QT_QPA_PLATFORM=offscreen
export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}"
# testcli and testgui are flaky - skip them both
make test ARGS+="-E 'testcli|testgui' --output-on-failure"
runHook postCheck
'';
nativeBuildInputs = [ cmake wrapQtAppsHook qttools ];
nativeBuildInputs = [ cmake wrapQtAppsHook qttools pkg-config ];
buildInputs = [
asciidoctor
@ -103,7 +102,6 @@ stdenv.mkDerivation rec {
libgpgerror
libsodium
libyubikey
pkg-config
qrencode
qtbase
qtsvg
@ -124,7 +122,7 @@ stdenv.mkDerivation rec {
description = "Password manager to store your passwords safely and auto-type them into your everyday websites and applications";
longDescription = "A community fork of KeePassX, which is itself a port of KeePass Password Safe. The goal is to extend and improve KeePassX with new features and bugfixes to provide a feature-rich, fully cross-platform and modern open-source password manager. Accessible via native cross-platform GUI, CLI, and browser integration with the KeePassXC Browser Extension (https://github.com/keepassxreboot/keepassxc-browser).";
homepage = "https://keepassxc.org/";
license = licenses.gpl2;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ jonafato turion ];
platforms = platforms.linux ++ platforms.darwin;
};