From 364e6e634b9d8f44ce68677f7cf1186eaea22c77 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Fri, 21 May 2021 10:29:29 +0900 Subject: [PATCH] subversion: update libtool to fix build on aarch64-darwin --- .../version-management/subversion/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 042dafbb674..6411e834327 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")