git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #59296 from Quiark/master
eeec334Pascal Wittmann
pkgs/applications/misc/keepassx/community.nix+9−3
@@ -15,6 +15,8 @@
15, libXi
15, libXi
16, qtx11extras
16, qtx11extras
17, qtmacextras
17, qtmacextras
18+, qtsvg
19+, qrencode
18
20
19, withKeePassBrowser ? true
21, withKeePassBrowser ? true
20, withKeePassSSHAgent ? true
22, withKeePassSSHAgent ? true
@@ -26,13 +28,13 @@ with stdenv.lib;
26
28
27stdenv.mkDerivation rec {
29stdenv.mkDerivation rec {
28 name = "keepassxc-${version}";
30 name = "keepassxc-${version}";
29− version = "2.3.4";
31+ version = "2.4.0";
30
32
31 src = fetchFromGitHub {
33 src = fetchFromGitHub {
32 owner = "keepassxreboot";
34 owner = "keepassxreboot";
33 repo = "keepassxc";
35 repo = "keepassxc";
34 rev = "${version}";
36 rev = "${version}";
35− sha256 = "1gja402dsbws4z8ybnhqbw7rc9svgqnshqjgf7158d6x0ni386m3";
37+ sha256 = "1k8s56003gym2dv6c54gxwzs20i7lf6w5g5qnr449jfmf6wvbivr";
36 };
38 };
37
39
38 NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [
40 NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [
@@ -50,7 +52,6 @@ stdenv.mkDerivation rec {
50
52
51 patches = [
53 patches = [
52 ./darwin.patch
54 ./darwin.patch
53− ./qt511.patch
54 ];
55 ];
55
56
56 cmakeFlags = [
57 cmakeFlags = [
@@ -58,6 +59,7 @@ stdenv.mkDerivation rec {
58 "-DWITH_GUI_TESTS=ON"
59 "-DWITH_GUI_TESTS=ON"
59 "-DWITH_XC_AUTOTYPE=ON"
60 "-DWITH_XC_AUTOTYPE=ON"
60 "-DWITH_XC_YUBIKEY=ON"
61 "-DWITH_XC_YUBIKEY=ON"
62+ "-DWITH_XC_KEESHARE=ON"
61 ]
63 ]
62 ++ (optional withKeePassBrowser "-DWITH_XC_BROWSER=ON")
64 ++ (optional withKeePassBrowser "-DWITH_XC_BROWSER=ON")
63 ++ (optional withKeePassHTTP "-DWITH_XC_HTTP=ON")
65 ++ (optional withKeePassHTTP "-DWITH_XC_HTTP=ON")
@@ -67,6 +69,8 @@ stdenv.mkDerivation rec {
67 doCheck = true;
69 doCheck = true;
68 checkPhase = ''
70 checkPhase = ''
69 export LC_ALL="en_US.UTF-8"
71 export LC_ALL="en_US.UTF-8"
72+ export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}"
73+ export QT_QPA_PLATFORM=offscreen
70 make test ARGS+="-E testgui --output-on-failure"
74 make test ARGS+="-E testgui --output-on-failure"
71 '';
75 '';
72
76
@@ -85,8 +89,10 @@ stdenv.mkDerivation rec {
85 libyubikey
89 libyubikey
86 qtbase
90 qtbase
87 qtx11extras
91 qtx11extras
92+ qtsvg
88 yubikey-personalization
93 yubikey-personalization
89 zlib
94 zlib
95+ qrencode
90 ] ++ stdenv.lib.optional stdenv.isDarwin qtmacextras;
96 ] ++ stdenv.lib.optional stdenv.isDarwin qtmacextras;
91
97
92 postInstall = optionalString stdenv.isDarwin ''
98 postInstall = optionalString stdenv.isDarwin ''
pkgs/applications/misc/keepassx/darwin.patch+37−36
@@ -1,52 +1,53 @@
1−Remove the use of macdeployqt to avoid copying dependencies and
1+diff --git a/CMakeLists.txt b/CMakeLists.txt
2−reduce installation size from 90 MB to 9 MB.
2+index 658548f7..f8f10bdb 100644
3--- a/CMakeLists.txt
3--- a/CMakeLists.txt
4+++ b/CMakeLists.txt
4+++ b/CMakeLists.txt
5−@@ -250,8 +250,8 @@ else()
5+@@ -288,6 +288,7 @@ if(MINGW)
6− set(PROGNAME keepassxc)
6+ set(PLUGIN_INSTALL_DIR ".")
7− endif()
7+ set(DATA_INSTALL_DIR "share")
8+ elseif(APPLE AND WITH_APP_BUNDLE)
9++ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Applications")
10+ set(CMAKE_INSTALL_MANDIR "${PROGNAME}.app/Contents/Resources/man")
11+ set(CLI_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS")
12+ set(PROXY_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS")
13+@@ -350,12 +351,6 @@ set(CMAKE_AUTORCC ON)
8
14
9−-if(APPLE AND WITH_APP_BUNDLE AND "${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr/local")
15+ if(APPLE)
10−- set(CMAKE_INSTALL_PREFIX "/Applications")
16+ set(CMAKE_MACOSX_RPATH TRUE)
11−+if(APPLE AND WITH_APP_BUNDLE)
17+- find_program(MACDEPLOYQT_EXE macdeployqt HINTS ${Qt5_PREFIX}/bin ENV PATH)
12−+ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Applications")
18+- if(NOT MACDEPLOYQT_EXE)
13− set(CMAKE_INSTALL_MANDIR "/usr/local/share/man")
19+- message(FATAL_ERROR "macdeployqt is required to build in macOS")
20+- else()
21+- message(STATUS "Using macdeployqt: ${MACDEPLOYQT_EXE}")
22+- endif()
14 endif()
23 endif()
15
24
16−@@ -262,7 +262,7 @@ if(MINGW)
25+ # Debian sets the the build type to None for package builds.
17− set(PLUGIN_INSTALL_DIR ".")
18− set(DATA_INSTALL_DIR "share")
19− elseif(APPLE AND WITH_APP_BUNDLE)
20−- set(CLI_INSTALL_DIR "/usr/local/bin")
21−+ set(CLI_INSTALL_DIR "../bin")
22− set(PROXY_INSTALL_DIR "/usr/local/bin")
23− set(BIN_INSTALL_DIR ".")
24− set(PLUGIN_INSTALL_DIR "${PROGNAME}.app/Contents/PlugIns")
25diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
26diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
26−index 69526967..38f7c5d4 100644
27+index 110dc606..f9b58818 100644
27--- a/src/CMakeLists.txt
28--- a/src/CMakeLists.txt
28+++ b/src/CMakeLists.txt
29+++ b/src/CMakeLists.txt
29−@@ -319,11 +319,6 @@ if(APPLE AND WITH_APP_BUNDLE)
30+@@ -343,11 +343,6 @@ if(APPLE AND WITH_APP_BUNDLE)
30− set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION}")
31+ set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION}")
31− include(CPack)
32+ include(CPack)
32
33
33−- add_custom_command(TARGET ${PROGNAME}
34+- add_custom_command(TARGET ${PROGNAME}
34−- POST_BUILD
35+- POST_BUILD
35−- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app
36+- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app
36−- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
37+- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
37−- COMMENT "Deploying app bundle")
38+- COMMENT "Deploying app bundle")
38 endif()
39 endif()
39
40
40 install(TARGETS ${PROGNAME}
41 install(TARGETS ${PROGNAME}
41diff --git a/src/autotype/mac/CMakeLists.txt b/src/autotype/mac/CMakeLists.txt
42diff --git a/src/autotype/mac/CMakeLists.txt b/src/autotype/mac/CMakeLists.txt
42−index 08c53278..b833b692 100644
43+index f1c5387f..abf70b48 100644
43--- a/src/autotype/mac/CMakeLists.txt
44--- a/src/autotype/mac/CMakeLists.txt
44+++ b/src/autotype/mac/CMakeLists.txt
45+++ b/src/autotype/mac/CMakeLists.txt
45−@@ -14,7 +14,6 @@ if(WITH_APP_BUNDLE)
46+@@ -12,7 +12,6 @@ if(WITH_APP_BUNDLE)
46− add_custom_command(TARGET keepassx-autotype-cocoa
47+ add_custom_command(TARGET keepassx-autotype-cocoa
47− POST_BUILD
48+ POST_BUILD
48− COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libkeepassx-autotype-cocoa.so ${PLUGIN_INSTALL_DIR}
49+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libkeepassx-autotype-cocoa.so ${PLUGIN_INSTALL_DIR}
49−- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app -executable=${PLUGIN_INSTALL_DIR}/libkeepassx-autotype-cocoa.so -no-plugins
50+- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app -executable=${PLUGIN_INSTALL_DIR}/libkeepassx-autotype-cocoa.so -no-plugins
50− WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
51+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
51− COMMENT "Deploying autotype plugin")
52+ COMMENT "Deploying autotype plugin")
52 else()
53 else()