summary refs log tree commit diff
path: root/pkgs/applications/misc/keepassx
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@higgsboson.tk>2017-02-21 23:22:08 +0100
committerBjørn Forsman <bjorn.forsman@gmail.com>2017-02-28 21:44:15 +0100
commit61785c55319dbb1d3af1f2d362d028f6814570af (patch)
tree1b0977ea1b02492ce493397e0ef48abea8fb0249 /pkgs/applications/misc/keepassx
parent62c5f6884720205a442073612d59f7a9969b09d8 (diff)
downloadnixpkgs-61785c55319dbb1d3af1f2d362d028f6814570af.tar
nixpkgs-61785c55319dbb1d3af1f2d362d028f6814570af.tar.gz
nixpkgs-61785c55319dbb1d3af1f2d362d028f6814570af.tar.bz2
nixpkgs-61785c55319dbb1d3af1f2d362d028f6814570af.tar.lz
nixpkgs-61785c55319dbb1d3af1f2d362d028f6814570af.tar.xz
nixpkgs-61785c55319dbb1d3af1f2d362d028f6814570af.tar.zst
nixpkgs-61785c55319dbb1d3af1f2d362d028f6814570af.zip
keepassxc: 2.1.0 -> 2.1.2
also enable http plugin again. Readme mention using the protocol be a
security risk because it is unencrypted, but the connections stays local
(127.0.0.1) and the plugins has to explicitly enabled in settings
(disabled by default).
Diffstat (limited to 'pkgs/applications/misc/keepassx')
-rw-r--r--pkgs/applications/misc/keepassx/community.nix15
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix
index 58b45786c40..c5bd9afd2cf 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -1,17 +1,24 @@
-{ stdenv, fetchFromGitHub, cmake, libgcrypt, zlib, libmicrohttpd, libXtst, qtbase, qttools }:
+{ stdenv, fetchFromGitHub,
+  cmake, libgcrypt, zlib, libmicrohttpd, libXtst, qtbase, qttools, libgpgerror
+, withKeePassHTTP ? true
+}:
+
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "keepassx-community-${version}";
-  version = "2.1.0";
+  version = "2.1.2";
 
   src = fetchFromGitHub {
     owner = "keepassxreboot";
     repo = "keepassxc";
     rev = "${version}";
-    sha256 = "0qwmi9f8ik3vkwl1kx7g3079h5ia4wl87y42nr5dal3ic1jc941p";
+    sha256 = "0ncc157xki1mzxfa41bgwjfsz5jq9sq750ka578lq61smyzh5lq6";
   };
 
-  buildInputs = [ cmake libgcrypt zlib qtbase qttools libXtst libmicrohttpd ];
+  cmakeFlags = optional (withKeePassHTTP) [ "-DWITH_XC_HTTP=ON" ];
+
+  buildInputs = [ cmake libgcrypt zlib qtbase qttools libXtst libmicrohttpd libgpgerror ];
 
   meta = {
     description = "Fork of the keepassX password-manager with additional http-interface to allow browser-integration an use with plugins such as PasslFox (https://github.com/pfn/passifox). See also keepassX2.";