From 674c8cacbcf1dcbb4ae79966be97bf35101521d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 4 Mar 2018 13:18:17 +0000 Subject: [PATCH 1/2] keepassxc: enable ssh agent sockets --- pkgs/applications/misc/keepassx/community.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 6f2f31473eb..55ed1fe148b 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -16,9 +16,9 @@ , qtx11extras , withKeePassBrowser ? true +, withKeePassSSHAgent ? true , withKeePassHTTP ? false , withKeePassNetworking ? false -, withKeePassSSHAgent ? false }: with stdenv.lib; From 5bb9c369986f74876b492abe1780ff694ab56529 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 4 Mar 2018 20:49:34 +0000 Subject: [PATCH 2/2] keepassxc: hopefully fix darwin --- pkgs/applications/misc/keepassx/community.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 55ed1fe148b..4daa1938aba 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { sha256 = "1zch1qbqgphhp2p2kvjlah8s337162m69yf4y00kcnfb3539ii5f"; }; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-old-style-cast"; + patches = [ ./darwin.patch ]; cmakeFlags = [