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