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

Merge pull request #109800 from claudiiii/keepassxc-update

Browse Source 
keepassxc: 2.6.2 -> 2.6.3
This commit is contained in:
Sandro 2021-01-18 21:38:24 +01:00 committed by GitHub
commit 4dffb6a75c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,13 +40,13 @@ with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "keepassxc"; pname = "keepassxc";
version = "2.6.2"; version = "2.6.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "keepassxreboot"; owner = "keepassxreboot";
repo = "keepassxc"; repo = "keepassxc";
rev = version; rev = version;
sha256 = "032dzywvwpclhsl3n1pq2m9gyxqpg0gkci6axbvbs7bn82wznc4h"; sha256 = "1jd2mvafyn095crfs2hnfprqiy8yqsvfybwbjq8n0agapnz4bl5h";
}; };
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang [ 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"}" "-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"; NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib";
patches = [ patches = [
@ -83,14 +78,18 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
checkPhase = '' checkPhase = ''
runHook preCheck
export LC_ALL="en_US.UTF-8" export LC_ALL="en_US.UTF-8"
export QT_QPA_PLATFORM=offscreen export QT_QPA_PLATFORM=offscreen
export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}" export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}"
# testcli and testgui are flaky - skip them both # testcli and testgui are flaky - skip them both
make test ARGS+="-E 'testcli|testgui' --output-on-failure" make test ARGS+="-E 'testcli|testgui' --output-on-failure"
runHook postCheck
''; '';
nativeBuildInputs = [ cmake wrapQtAppsHook qttools ]; nativeBuildInputs = [ cmake wrapQtAppsHook qttools pkg-config ];
buildInputs = [ buildInputs = [
asciidoctor asciidoctor
@ -103,7 +102,6 @@ stdenv.mkDerivation rec {
libgpgerror libgpgerror
libsodium libsodium
libyubikey libyubikey
pkg-config
qrencode qrencode
qtbase qtbase
qtsvg 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"; 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)."; 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/"; homepage = "https://keepassxc.org/";
license = licenses.gpl2; license = licenses.gpl2Plus;
maintainers = with maintainers; [ jonafato turion ]; maintainers = with maintainers; [ jonafato turion ];
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.linux ++ platforms.darwin;
}; };