cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

subversion: enable darwin keychain support (#176730)

Browse source 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
hyqhyq_3 2022-06-10 07:02:28 +08:00 committed by GitHub
parent accc4e2b60
commit 99fcf0ee74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/applications/version-management/subversion/default.nix
View file

@ -6,6 +6,7 @@
, javahlBindings ? false , javahlBindings ? false
, saslSupport ? false , saslSupport ? false
, lib, stdenv, fetchurl, apr, aprutil, zlib, sqlite, openssl, lz4, utf8proc , lib, stdenv, fetchurl, apr, aprutil, zlib, sqlite, openssl, lz4, utf8proc
, CoreServices, Security
, autoconf, libtool , autoconf, libtool
, apacheHttpd ? null, expat, swig ? null, jdk ? null, python3 ? null, py3c ? null, perl ? null , apacheHttpd ? null, expat, swig ? null, jdk ? null, python3 ? null, py3c ? null, perl ? null
, sasl ? null, serf ? null , sasl ? null, serf ? null
@ -38,7 +39,8 @@ let
++ lib.optional httpSupport serf ++ lib.optional httpSupport serf
++ lib.optionals pythonBindings [ python3 py3c ] ++ lib.optionals pythonBindings [ python3 py3c ]
++ lib.optional perlBindings perl ++ lib.optional perlBindings perl
++ lib.optional saslSupport sasl; ++ lib.optional saslSupport sasl
++ lib.optional stdenv.hostPlatform.isDarwin [ CoreServices Security ];
patches = [ ./apr-1.patch ] ++ extraPatches; patches = [ ./apr-1.patch ] ++ extraPatches;
@ -57,7 +59,6 @@ let
(lib.withFeatureAs (pythonBindings || perlBindings) "swig" swig) (lib.withFeatureAs (pythonBindings || perlBindings) "swig" swig)
(lib.withFeatureAs saslSupport "sasl" sasl) (lib.withFeatureAs saslSupport "sasl" sasl)
(lib.withFeatureAs httpSupport "serf" serf) (lib.withFeatureAs httpSupport "serf" serf)
"--disable-keychain"
"--with-zlib=${zlib.dev}" "--with-zlib=${zlib.dev}"
"--with-sqlite=${sqlite.dev}" "--with-sqlite=${sqlite.dev}"
] ++ lib.optionals javahlBindings [ ] ++ lib.optionals javahlBindings [

6
pkgs/top-level/all-packages.nix
View file

@ -29792,8 +29792,10 @@ with pkgs;
sublime-merge sublime-merge
sublime-merge-dev; sublime-merge-dev;
inherit (callPackages ../applications/version-management/subversion { sasl = cyrus_sasl; }) inherit (callPackages ../applications/version-management/subversion {
subversion; sasl = cyrus_sasl;
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
}) subversion;
subversionClient = subversion.override { subversionClient = subversion.override {
bdbSupport = false; bdbSupport = false;