pyrox.dev
subversion: update libtool to fix build on aarch64-darwin
+9
pkgs/applications/version-management/subversion/default.nix
+9
pkgs/applications/version-management/subversion/default.nix
···
6
6
, javahlBindings ? false
7
7
, saslSupport ? false
8
8
, lib, stdenv, fetchurl, apr, aprutil, zlib, sqlite, openssl, lz4, utf8proc
9
+
, autoconf, libtool
9
10
, apacheHttpd ? null, expat, swig ? null, jdk ? null, python3 ? null, py3c ? null, perl ? null
10
11
, sasl ? null, serf ? null
11
12
}:
···
16
17
assert javahlBindings -> jdk != null && perl != null;
17
18
18
19
let
20
+
# Update libtool for macOS 11 support
21
+
needsAutogen = stdenv.hostPlatform.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11";
19
22
20
23
common = { version, sha256, extraPatches ? [ ] }: stdenv.mkDerivation (rec {
21
24
inherit version;
···
28
31
29
32
# Can't do separate $lib and $bin, as libs reference bins
30
33
outputs = [ "out" "dev" "man" ];
34
+
35
+
nativeBuildInputs = lib.optionals needsAutogen [ autoconf libtool python3 ];
31
36
32
37
buildInputs = [ zlib apr aprutil sqlite openssl lz4 utf8proc ]
33
38
++ lib.optional httpSupport serf
···
41
46
# -> https://issues.apache.org/jira/browse/SVN-4813
42
47
# "-P" CPPFLAG is needed to build Python bindings and subversionClient
43
48
CPPFLAGS = [ "-P" ];
49
+
50
+
preConfigure = lib.optionalString needsAutogen ''
51
+
./autogen.sh
52
+
'';
44
53
45
54
configureFlags = [
46
55
(lib.withFeature bdbSupport "berkeley-db")