From beddcca93f45929dfafb5891148937a7dbf1926d Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 18 Feb 2023 21:44:54 +0200 Subject: [PATCH] keepassxc: fix build on darwin --- pkgs/applications/misc/keepassx/community.nix | 5 +++-- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index bf386c116d48..fd37735c64ce 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , cmake , qttools -, darwin , asciidoctor , botan2 @@ -25,6 +24,8 @@ , wrapQtAppsHook , zlib +, LocalAuthentication + , withKeePassBrowser ? true , withKeePassFDOSecrets ? true , withKeePassKeeShare ? true @@ -110,7 +111,7 @@ stdenv.mkDerivation rec { readline zlib ] - ++ lib.optional (stdenv.isDarwin && withKeePassTouchID) darwin.apple_sdk.frameworks.LocalAuthentication + ++ lib.optional (stdenv.isDarwin && withKeePassTouchID) LocalAuthentication ++ lib.optional stdenv.isDarwin qtmacextras ++ lib.optional stdenv.isLinux libusb1 ++ lib.optional withKeePassX11 qtx11extras; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f7c591eae2b..98c9a3017875 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29285,7 +29285,10 @@ with pkgs; keepassx = callPackage ../applications/misc/keepassx { }; keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { }; - keepassxc = libsForQt5.callPackage ../applications/misc/keepassx/community.nix { }; + keepassxc = libsForQt5.callPackage ../applications/misc/keepassx/community.nix { + inherit (darwin.apple_sdk_11_0.frameworks) LocalAuthentication; + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + }; keepass-diff = callPackage ../applications/misc/keepass-diff { };