keepassxc: fix darwin build

- Removed the unnecessary libmicrohttpd dependency, which doesn't
  build on macOS. KeepassXC removed this dependency in 2.1.2
- Fixed a compiler error related to the Touch ID feature by adding a
  dependency on the LocalAuthentication framework
This commit is contained in:
squalus 2020-01-03 17:51:39 -08:00 committed by Bjørn Forsman
parent ccce14ed53
commit 9314327dee
2 changed files with 5 additions and 5 deletions

View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, makeWrapper, qttools { stdenv, fetchFromGitHub, cmake, makeWrapper, qttools, darwin
, curl , curl
, glibcLocales , glibcLocales
@ -7,7 +7,6 @@
, libargon2 , libargon2
, libgcrypt , libgcrypt
, libgpgerror , libgpgerror
, libmicrohttpd
, libsodium , libsodium
, libyubikey , libyubikey
, pkg-config , pkg-config
@ -93,7 +92,6 @@ stdenv.mkDerivation rec {
libargon2 libargon2
libgcrypt libgcrypt
libgpgerror libgpgerror
libmicrohttpd
libsodium libsodium
libyubikey libyubikey
pkg-config pkg-config
@ -105,7 +103,8 @@ stdenv.mkDerivation rec {
zlib zlib
] ]
++ stdenv.lib.optional withKeePassKeeShareSecure quazip ++ stdenv.lib.optional withKeePassKeeShareSecure quazip
++ stdenv.lib.optional stdenv.isDarwin qtmacextras; ++ stdenv.lib.optional stdenv.isDarwin qtmacextras
++ stdenv.lib.optional (stdenv.isDarwin && withKeePassTouchID) darwin.apple_sdk.frameworks.LocalAuthentication;
preFixup = optionalString stdenv.isDarwin '' preFixup = optionalString stdenv.isDarwin ''
# Make it work without Qt in PATH. # Make it work without Qt in PATH.
@ -118,6 +117,6 @@ stdenv.mkDerivation rec {
homepage = https://keepassxc.org/; homepage = https://keepassxc.org/;
license = licenses.gpl2; license = licenses.gpl2;
maintainers = with maintainers; [ jonafato ]; maintainers = with maintainers; [ jonafato ];
platforms = with platforms; linux ++ darwin; platforms = platforms.linux ++ platforms.darwin;
}; };
} }

View File

@ -70,6 +70,7 @@ with frameworks; with libs; {
Kernel = [ IOKit ]; Kernel = [ IOKit ];
LDAP = []; LDAP = [];
LatentSemanticMapping = [ Carbon ]; LatentSemanticMapping = [ Carbon ];
LocalAuthentication = [];
MapKit = []; MapKit = [];
MediaAccessibility = [ CoreGraphics CoreText QuartzCore ]; MediaAccessibility = [ CoreGraphics CoreText QuartzCore ];
MediaToolbox = [ AudioToolbox AudioUnit CoreMedia ]; MediaToolbox = [ AudioToolbox AudioUnit CoreMedia ];