git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #66572 from fgaz/keepassxc/update1

keepassxc: 2.4.1 -> 2.4.3

commit9fd5b752e1397ae498d0f062594a6d451523d46d authorMarek Mahut <marek.mahut@gmail.com> dateThu 22 Aug 2019, 07:11 (7 years ago) parent8b56d204521288
2 files changed+13−13
pkgs/applications/misc/keepassx/community.nix+2−2 pkgs/applications/misc/keepassx/darwin.patch+11−11
pkgs/applications/misc/keepassx/community.nix+2−2
@@ -32,13 +32,13 @@ with stdenv.lib;
3232
3333stdenv.mkDerivation rec {
3434 name = "keepassxc-${version}";
35− version = "2.4.1";
35+ version = "2.4.3";
3636
3737 src = fetchFromGitHub {
3838 owner = "keepassxreboot";
3939 repo = "keepassxc";
4040 rev = "${version}";
41− sha256 = "1cbfsfdvb4qw6yb0zl6mymdbphnb7lxbfrc5a8cjmn9w8b09kv6m";
41+ sha256 = "1r63bl0cam04rps1bjr107qvwsmay4254nv00gwhh9n45s6cslac";
4242 };
4343
4444 NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [
pkgs/applications/misc/keepassx/darwin.patch+11−11
@@ -1,8 +1,8 @@
11diff --git a/CMakeLists.txt b/CMakeLists.txt
2−index 658548f7..f8f10bdb 100644
2+index 74b1a7ff..0a713a32 100644
33--- a/CMakeLists.txt
44+++ b/CMakeLists.txt
5−@@ -288,6 +288,7 @@ if(MINGW)
5+@@ -307,6 +307,7 @@ if(MINGW)
66 set(PLUGIN_INSTALL_DIR ".")
77 set(DATA_INSTALL_DIR "share")
88 elseif(APPLE AND WITH_APP_BUNDLE)
@@ -10,24 +10,24 @@ index 658548f7..f8f10bdb 100644
1010 set(CMAKE_INSTALL_MANDIR "${PROGNAME}.app/Contents/Resources/man")
1111 set(CLI_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS")
1212 set(PROXY_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS")
13−@@ -350,12 +351,6 @@ set(CMAKE_AUTORCC ON)
13+@@ -369,12 +370,6 @@ set(CMAKE_AUTORCC ON)
1414
1515 if(APPLE)
1616 set(CMAKE_MACOSX_RPATH TRUE)
1717- find_program(MACDEPLOYQT_EXE macdeployqt HINTS ${Qt5_PREFIX}/bin ENV PATH)
1818- if(NOT MACDEPLOYQT_EXE)
19−- message(FATAL_ERROR "macdeployqt is required to build in macOS")
19+- message(FATAL_ERROR "macdeployqt is required to build on macOS")
2020- else()
2121- message(STATUS "Using macdeployqt: ${MACDEPLOYQT_EXE}")
2222- endif()
23− endif()
24−
25− # Debian sets the the build type to None for package builds.
23+ elseif(MINGW)
24+ find_program(WINDEPLOYQT_EXE windeployqt HINTS ${Qt5_PREFIX}/bin ENV PATH)
25+ if(NOT WINDEPLOYQT_EXE)
2626diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
27−index 110dc606..f9b58818 100644
27+index f142f368..0742512d 100644
2828--- a/src/CMakeLists.txt
2929+++ b/src/CMakeLists.txt
30−@@ -343,11 +343,6 @@ if(APPLE AND WITH_APP_BUNDLE)
30+@@ -351,11 +351,6 @@ if(APPLE AND WITH_APP_BUNDLE)
3131 set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION}")
3232 include(CPack)
3333
@@ -40,10 +40,10 @@ index 110dc606..f9b58818 100644
4040
4141 install(TARGETS ${PROGNAME}
4242diff --git a/src/autotype/mac/CMakeLists.txt b/src/autotype/mac/CMakeLists.txt
43−index f1c5387f..abf70b48 100644
43+index 7427450a..a0a58d71 100644
4444--- a/src/autotype/mac/CMakeLists.txt
4545+++ b/src/autotype/mac/CMakeLists.txt
46−@@ -12,7 +12,6 @@ if(WITH_APP_BUNDLE)
46+@@ -8,7 +8,6 @@ if(WITH_APP_BUNDLE)
4747 add_custom_command(TARGET keepassx-autotype-cocoa
4848 POST_BUILD
4949 COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libkeepassx-autotype-cocoa.so ${PLUGIN_INSTALL_DIR}