diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 13bdc31f735d..5731ef59deb7 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -6,6 +6,7 @@ , javahlBindings ? false , saslSupport ? false , lib, stdenv, fetchurl, apr, aprutil, zlib, sqlite, openssl, lz4, utf8proc +, CoreServices, Security , autoconf, libtool , apacheHttpd ? null, expat, swig ? null, jdk ? null, python3 ? null, py3c ? null, perl ? null , sasl ? null, serf ? null @@ -38,7 +39,8 @@ let ++ lib.optional httpSupport serf ++ lib.optionals pythonBindings [ python3 py3c ] ++ lib.optional perlBindings perl - ++ lib.optional saslSupport sasl; + ++ lib.optional saslSupport sasl + ++ lib.optional stdenv.hostPlatform.isDarwin [ CoreServices Security ]; patches = [ ./apr-1.patch ] ++ extraPatches; @@ -57,7 +59,6 @@ let (lib.withFeatureAs (pythonBindings || perlBindings) "swig" swig) (lib.withFeatureAs saslSupport "sasl" sasl) (lib.withFeatureAs httpSupport "serf" serf) - "--disable-keychain" "--with-zlib=${zlib.dev}" "--with-sqlite=${sqlite.dev}" ] ++ lib.optionals javahlBindings [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08bfee59f808..57099552868d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29792,8 +29792,10 @@ with pkgs; sublime-merge sublime-merge-dev; - inherit (callPackages ../applications/version-management/subversion { sasl = cyrus_sasl; }) - subversion; + inherit (callPackages ../applications/version-management/subversion { + sasl = cyrus_sasl; + inherit (darwin.apple_sdk.frameworks) CoreServices Security; + }) subversion; subversionClient = subversion.override { bdbSupport = false;