diff options
author | Rouven Czerwinski <rouven@czerwinskis.de> | 2021-04-19 16:54:11 +0200 |
---|---|---|
committer | Rouven Czerwinski <rouven@czerwinskis.de> | 2021-04-19 16:54:11 +0200 |
commit | d18df82226d5d688b51d802bf60f27a44e6276e4 (patch) | |
tree | cb03a29c833357253161878f84c92d95c35f1f8b /pkgs/applications/version-management/subversion | |
parent | bf7940d1a8537bd1749bd39109851a73b112e4ef (diff) |
subversion: remove extraBuildInputs
No longer required since all subversion versions now share the same buildInputs.
Diffstat (limited to 'pkgs/applications/version-management/subversion')
-rw-r--r-- | pkgs/applications/version-management/subversion/default.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 18eaea0dd60a0..1f604c44d7855 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -17,7 +17,7 @@ assert javahlBindings -> jdk != null && perl != null; let - common = { version, sha256, extraBuildInputs ? [ ] }: stdenv.mkDerivation (rec { + common = { version, sha256 }: stdenv.mkDerivation (rec { inherit version; pname = "subversion"; @@ -29,8 +29,7 @@ let # Can't do separate $lib and $bin, as libs reference bins outputs = [ "out" "dev" "man" ]; - buildInputs = [ zlib apr aprutil sqlite openssl ] - ++ extraBuildInputs + buildInputs = [ zlib apr aprutil sqlite openssl lz4 utf8proc ] ++ lib.optional httpSupport serf ++ lib.optional pythonBindings python ++ lib.optional perlBindings perl @@ -114,12 +113,10 @@ in { subversion_1_10 = common { version = "1.10.7"; sha256 = "1nhrd8z6c94sc0ryrzpyd98qdn5a5g3x0xv1kdb9da4drrk8y2ww"; - extraBuildInputs = [ lz4 utf8proc ]; }; subversion = common { version = "1.12.2"; sha256 = "0wgpw3kzsiawzqk4y0xgh1z93kllxydgv4lsviim45y5wk4bbl1v"; - extraBuildInputs = [ lz4 utf8proc ]; }; } |