git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #59296 from Quiark/master

keepassxc: 2.3.4 -> 2.4.0

commiteeec3349b1a8bfbe0532bda97068e4eba7ec7359 authorPascal Wittmann <mail@pascal-wittmann.de> dateThu 11 Apr 2019, 14:25 (8 years ago) parenta4c15f177ce909
2 files changed+46−39
pkgs/applications/misc/keepassx/community.nix+9−3 pkgs/applications/misc/keepassx/darwin.patch+37−36
pkgs/applications/misc/keepassx/community.nix+9−3
@@ -15,6 +15,8 @@
1515, libXi
1616, qtx11extras
1717, qtmacextras
18+, qtsvg
19+, qrencode
1820
1921, withKeePassBrowser ? true
2022, withKeePassSSHAgent ? true
@@ -26,13 +28,13 @@ with stdenv.lib;
2628
2729stdenv.mkDerivation rec {
2830 name = "keepassxc-${version}";
29− version = "2.3.4";
31+ version = "2.4.0";
3032
3133 src = fetchFromGitHub {
3234 owner = "keepassxreboot";
3335 repo = "keepassxc";
3436 rev = "${version}";
35− sha256 = "1gja402dsbws4z8ybnhqbw7rc9svgqnshqjgf7158d6x0ni386m3";
37+ sha256 = "1k8s56003gym2dv6c54gxwzs20i7lf6w5g5qnr449jfmf6wvbivr";
3638 };
3739
3840 NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [
@@ -50,7 +52,6 @@ stdenv.mkDerivation rec {
5052
5153 patches = [
5254 ./darwin.patch
53− ./qt511.patch
5455 ];
5556
5657 cmakeFlags = [
@@ -58,6 +59,7 @@ stdenv.mkDerivation rec {
5859 "-DWITH_GUI_TESTS=ON"
5960 "-DWITH_XC_AUTOTYPE=ON"
6061 "-DWITH_XC_YUBIKEY=ON"
62+ "-DWITH_XC_KEESHARE=ON"
6163 ]
6264 ++ (optional withKeePassBrowser "-DWITH_XC_BROWSER=ON")
6365 ++ (optional withKeePassHTTP "-DWITH_XC_HTTP=ON")
@@ -67,6 +69,8 @@ stdenv.mkDerivation rec {
6769 doCheck = true;
6870 checkPhase = ''
6971 export LC_ALL="en_US.UTF-8"
72+ export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}"
73+ export QT_QPA_PLATFORM=offscreen
7074 make test ARGS+="-E testgui --output-on-failure"
7175 '';
7276
@@ -85,8 +89,10 @@ stdenv.mkDerivation rec {
8589 libyubikey
8690 qtbase
8791 qtx11extras
92+ qtsvg
8893 yubikey-personalization
8994 zlib
95+ qrencode
9096 ] ++ stdenv.lib.optional stdenv.isDarwin qtmacextras;
9197
9298 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
2−reduce installation size from 90 MB to 9 MB.
1+diff --git a/CMakeLists.txt b/CMakeLists.txt
2+index 658548f7..f8f10bdb 100644
33--- a/CMakeLists.txt
44+++ b/CMakeLists.txt
5−@@ -250,8 +250,8 @@ else()
6− set(PROGNAME keepassxc)
7− endif()
5+@@ -288,6 +288,7 @@ if(MINGW)
6+ set(PLUGIN_INSTALL_DIR ".")
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)
814
9−-if(APPLE AND WITH_APP_BUNDLE AND "${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr/local")
10−- set(CMAKE_INSTALL_PREFIX "/Applications")
11−+if(APPLE AND WITH_APP_BUNDLE)
12−+ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Applications")
13− set(CMAKE_INSTALL_MANDIR "/usr/local/share/man")
15+ if(APPLE)
16+ set(CMAKE_MACOSX_RPATH TRUE)
17+- find_program(MACDEPLOYQT_EXE macdeployqt HINTS ${Qt5_PREFIX}/bin ENV PATH)
18+- if(NOT MACDEPLOYQT_EXE)
19+- message(FATAL_ERROR "macdeployqt is required to build in macOS")
20+- else()
21+- message(STATUS "Using macdeployqt: ${MACDEPLOYQT_EXE}")
22+- endif()
1423 endif()
1524
16−@@ -262,7 +262,7 @@ if(MINGW)
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")
25+ # Debian sets the the build type to None for package builds.
2526diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
26−index 69526967..38f7c5d4 100644
27+index 110dc606..f9b58818 100644
2728--- a/src/CMakeLists.txt
2829+++ b/src/CMakeLists.txt
29−@@ -319,11 +319,6 @@ if(APPLE AND WITH_APP_BUNDLE)
30− set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION}")
31− include(CPack)
30+@@ -343,11 +343,6 @@ if(APPLE AND WITH_APP_BUNDLE)
31+ set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION}")
32+ include(CPack)
3233
33−- add_custom_command(TARGET ${PROGNAME}
34−- POST_BUILD
35−- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app
36−- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
37−- COMMENT "Deploying app bundle")
34+- add_custom_command(TARGET ${PROGNAME}
35+- POST_BUILD
36+- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app
37+- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
38+- COMMENT "Deploying app bundle")
3839 endif()
3940
4041 install(TARGETS ${PROGNAME}
4142diff --git a/src/autotype/mac/CMakeLists.txt b/src/autotype/mac/CMakeLists.txt
42−index 08c53278..b833b692 100644
43+index f1c5387f..abf70b48 100644
4344--- a/src/autotype/mac/CMakeLists.txt
4445+++ b/src/autotype/mac/CMakeLists.txt
45−@@ -14,7 +14,6 @@ if(WITH_APP_BUNDLE)
46− add_custom_command(TARGET keepassx-autotype-cocoa
47− POST_BUILD
48− 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− WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
51− COMMENT "Deploying autotype plugin")
46+@@ -12,7 +12,6 @@ if(WITH_APP_BUNDLE)
47+ add_custom_command(TARGET keepassx-autotype-cocoa
48+ POST_BUILD
49+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libkeepassx-autotype-cocoa.so ${PLUGIN_INSTALL_DIR}
50+- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app -executable=${PLUGIN_INSTALL_DIR}/libkeepassx-autotype-cocoa.so -no-plugins
51+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
52+ COMMENT "Deploying autotype plugin")
5253 else()