mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-29 06:45:54 +03:00
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:
parent
ccce14ed53
commit
9314327dee
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, makeWrapper, qttools
|
||||
{ stdenv, fetchFromGitHub, cmake, makeWrapper, qttools, darwin
|
||||
|
||||
, curl
|
||||
, glibcLocales
|
||||
@ -7,7 +7,6 @@
|
||||
, libargon2
|
||||
, libgcrypt
|
||||
, libgpgerror
|
||||
, libmicrohttpd
|
||||
, libsodium
|
||||
, libyubikey
|
||||
, pkg-config
|
||||
@ -93,7 +92,6 @@ stdenv.mkDerivation rec {
|
||||
libargon2
|
||||
libgcrypt
|
||||
libgpgerror
|
||||
libmicrohttpd
|
||||
libsodium
|
||||
libyubikey
|
||||
pkg-config
|
||||
@ -105,7 +103,8 @@ stdenv.mkDerivation rec {
|
||||
zlib
|
||||
]
|
||||
++ 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 ''
|
||||
# Make it work without Qt in PATH.
|
||||
@ -118,6 +117,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = https://keepassxc.org/;
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ jonafato ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
@ -70,6 +70,7 @@ with frameworks; with libs; {
|
||||
Kernel = [ IOKit ];
|
||||
LDAP = [];
|
||||
LatentSemanticMapping = [ Carbon ];
|
||||
LocalAuthentication = [];
|
||||
MapKit = [];
|
||||
MediaAccessibility = [ CoreGraphics CoreText QuartzCore ];
|
||||
MediaToolbox = [ AudioToolbox AudioUnit CoreMedia ];
|
||||
|
Loading…
Reference in New Issue
Block a user