diff options
| author | Andrew Childs <lorne@cons.org.nz> | 2021-05-21 10:29:29 +0900 |
|---|---|---|
| committer | Andrew Childs <lorne@cons.org.nz> | 2021-05-27 14:01:54 +0900 |
| commit | 364e6e634b9d8f44ce68677f7cf1186eaea22c77 (patch) | |
| tree | 9cf22521915eaeec7eb69c5fb53c1db1f2731dca /pkgs/applications/version-management/subversion | |
| parent | 11e02bd01d0a9991ac82c2adf77d4bff6e1bce1f (diff) | |
subversion: update libtool to fix build on aarch64-darwin
Diffstat (limited to 'pkgs/applications/version-management/subversion')
| -rw-r--r-- | pkgs/applications/version-management/subversion/default.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 042dafbb67453..6411e834327c9 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 +, autoconf, libtool , apacheHttpd ? null, expat, swig ? null, jdk ? null, python3 ? null, py3c ? null, perl ? null , sasl ? null, serf ? null }: @@ -16,6 +17,8 @@ assert pythonBindings -> swig != null && python3 != null && py3c != null; assert javahlBindings -> jdk != null && perl != null; let + # Update libtool for macOS 11 support + needsAutogen = stdenv.hostPlatform.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11"; common = { version, sha256, extraPatches ? [ ] }: stdenv.mkDerivation (rec { inherit version; @@ -29,6 +32,8 @@ let # Can't do separate $lib and $bin, as libs reference bins outputs = [ "out" "dev" "man" ]; + nativeBuildInputs = lib.optionals needsAutogen [ autoconf libtool python3 ]; + buildInputs = [ zlib apr aprutil sqlite openssl lz4 utf8proc ] ++ lib.optional httpSupport serf ++ lib.optionals pythonBindings [ python3 py3c ] @@ -42,6 +47,10 @@ let # "-P" CPPFLAG is needed to build Python bindings and subversionClient CPPFLAGS = [ "-P" ]; + preConfigure = lib.optionalString needsAutogen '' + ./autogen.sh + ''; + configureFlags = [ (lib.withFeature bdbSupport "berkeley-db") (lib.withFeatureAs httpServer "apxs" "${apacheHttpd.dev}/bin/apxs") |