pyrox.dev
Merge pull request #85558 from prusnak/keepassxc
keepassxc: 2.5.2 -> 2.5.4
authored by
Maximilian Bosch
and committed by
GitHub
07d62228
73d4b9c0
+16
-4
pkgs/applications/misc/keepassx/community.nix
+16
-4
pkgs/applications/misc/keepassx/community.nix
···
1
-
{ stdenv, fetchFromGitHub, cmake, makeWrapper, qttools, darwin
1
+
{ stdenv
2
+
, fetchFromGitHub
3
+
, fetchpatch
4
+
, cmake
5
+
, makeWrapper
6
+
, qttools
7
+
, darwin
2
8
3
9
, curl
4
10
, glibcLocales
···
33
39
34
40
stdenv.mkDerivation rec {
35
41
pname = "keepassxc";
36
-
version = "2.5.2";
42
+
version = "2.5.4";
37
43
38
44
src = fetchFromGitHub {
39
45
owner = "keepassxreboot";
40
46
repo = "keepassxc";
41
47
rev = version;
42
-
sha256 = "0z5bd17qaq7zpv96gw6qwv6rb4xx7xjq86ss6wm5zskcrraf7r7n";
48
+
sha256 = "1xih9q1pxszalc0l29fmjxwn1vrrrrbnhc8gmi8brw5sclhbs6bh";
43
49
};
44
50
45
51
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [
···
57
63
58
64
patches = [
59
65
./darwin.patch
66
+
# use wl-copy on Wayland - can be dropped with the next version update
67
+
(fetchpatch {
68
+
url = "https://github.com/keepassxreboot/keepassxc/commit/6128e5d58294f26411160f44da91087ebe7f4b07.patch";
69
+
sha256 = "16q0h7kijqjdbskmk4ar6p3g8vcxr0bq1zrlq2bk16pk10nv4bh1";
70
+
})
60
71
];
61
72
62
73
cmakeFlags = [
···
79
90
export LC_ALL="en_US.UTF-8"
80
91
export QT_QPA_PLATFORM=offscreen
81
92
export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}"
82
-
make test ARGS+="-E testgui --output-on-failure"
93
+
# testcli and testgui are flaky - skip them both
94
+
make test ARGS+="-E 'testcli|testgui' --output-on-failure"
83
95
'';
84
96
85
97
nativeBuildInputs = [ cmake wrapQtAppsHook qttools ];
+2
-2
pkgs/applications/misc/keepassx/darwin.patch
+2
-2
pkgs/applications/misc/keepassx/darwin.patch
···
6
6
set(PLUGIN_INSTALL_DIR ".")
7
7
set(DATA_INSTALL_DIR "share")
8
8
elseif(APPLE AND WITH_APP_BUNDLE)
9
-
+ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Applications")
9
+
+ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Applications")
10
+
set(BUNDLE_INSTALL_DIR "${PROGNAME}.app/Contents")
10
11
set(CMAKE_INSTALL_MANDIR "${PROGNAME}.app/Contents/Resources/man")
11
12
set(CLI_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS")
12
-
set(PROXY_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS")
13
13
@@ -369,12 +370,6 @@ set(CMAKE_AUTORCC ON)
14
14
15
15
if(APPLE)