diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-22 17:08:06 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-26 19:58:57 +0200 |
commit | 81447b6a598f76fae60ab8467da452f6c74259a7 (patch) | |
tree | 7d42ea7e460c82b20b0c3655127da381a7a4caf8 /pkgs | |
parent | cd901eac5f16884ff5de5cd92172612767beeb0c (diff) |
subversion: Remove openssl.dev from the runtime closure
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/version-management/subversion/default.nix | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 223a10fb983c..034bde6911ec 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -7,7 +7,7 @@ , saslSupport ? false , stdenv, fetchurl, apr, aprutil, zlib, sqlite , apacheHttpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null -, sasl ? null, serf ? null +, sasl ? null, serf ? null, openssl }: assert bdbSupport -> aprutil.bdbSupport; @@ -29,7 +29,7 @@ let # Can't do separate $lib and $bin, as libs reference bins outputs = [ "out" "dev" "man" ]; - buildInputs = [ zlib apr aprutil sqlite ] + buildInputs = [ zlib apr aprutil sqlite openssl ] ++ stdenv.lib.optional httpSupport serf ++ stdenv.lib.optional pythonBindings python ++ stdenv.lib.optional perlBindings perl @@ -75,11 +75,13 @@ let mkdir -p $out/share/bash-completion/completions cp tools/client-side/bash_completion $out/share/bash-completion/completions/subversion - for f in $out/lib/*.la; do - substituteInPlace $f --replace "${expat.dev}/lib" "${expat.out}/lib" - substituteInPlace $f --replace "${zlib.dev}/lib" "${zlib.out}/lib" - substituteInPlace $f --replace "${sqlite.dev}/lib" "${sqlite.out}/lib" - done + for f in $out/lib/*.la; do + substituteInPlace $f \ + --replace "${expat.dev}/lib" "${expat.out}/lib" \ + --replace "${zlib.dev}/lib" "${zlib.out}/lib" \ + --replace "${sqlite.dev}/lib" "${sqlite.out}/lib" \ + --replace "${openssl.dev}/lib" "${openssl.out}/lib" + done ''; inherit perlBindings pythonBindings; |