diff options
| author | hyqhyq_3 <huangyangqi@gmail.com> | 2022-06-10 07:02:28 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-10 01:02:28 +0200 |
| commit | 99fcf0ee74957231ff0471228e9a59f976a0266b (patch) | |
| tree | a0dadf67a2037a0d206e2e66d06e50d30dcd708f | |
| parent | accc4e2b60315a00a30aa513d8883172aaf62f53 (diff) | |
| download | nixpkgs-99fcf0ee74957231ff0471228e9a59f976a0266b.tar nixpkgs-99fcf0ee74957231ff0471228e9a59f976a0266b.tar.gz nixpkgs-99fcf0ee74957231ff0471228e9a59f976a0266b.tar.bz2 nixpkgs-99fcf0ee74957231ff0471228e9a59f976a0266b.tar.lz nixpkgs-99fcf0ee74957231ff0471228e9a59f976a0266b.tar.xz nixpkgs-99fcf0ee74957231ff0471228e9a59f976a0266b.tar.zst nixpkgs-99fcf0ee74957231ff0471228e9a59f976a0266b.zip | |
subversion: enable darwin keychain support (#176730)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
| -rw-r--r-- | pkgs/applications/version-management/subversion/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 13bdc31f735..5731ef59deb 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 08bfee59f80..57099552868 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; |