public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

subversion: Remove openssl.dev from the runtime closure

Browse Source
This commit is contained in:
Eelco Dolstra 2016-09-22 17:08:06 +02:00
parent cd901eac5f
commit 81447b6a59
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/version-management/subversion/default.nix
View File

@ -7,7 +7,7 @@
, saslSupport ? false , saslSupport ? false
, stdenv, fetchurl, apr, aprutil, zlib, sqlite , stdenv, fetchurl, apr, aprutil, zlib, sqlite
, apacheHttpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null , apacheHttpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null
, sasl ? null, serf ? null , sasl ? null, serf ? null, openssl
}: }:
assert bdbSupport -> aprutil.bdbSupport; assert bdbSupport -> aprutil.bdbSupport;
@ -29,7 +29,7 @@ let
# Can't do separate $lib and $bin, as libs reference bins # Can't do separate $lib and $bin, as libs reference bins
outputs = [ "out" "dev" "man" ]; outputs = [ "out" "dev" "man" ];
buildInputs = [ zlib apr aprutil sqlite ] buildInputs = [ zlib apr aprutil sqlite openssl ]
++ stdenv.lib.optional httpSupport serf ++ stdenv.lib.optional httpSupport serf
++ stdenv.lib.optional pythonBindings python ++ stdenv.lib.optional pythonBindings python
++ stdenv.lib.optional perlBindings perl ++ stdenv.lib.optional perlBindings perl
@ -75,11 +75,13 @@ let
mkdir -p $out/share/bash-completion/completions mkdir -p $out/share/bash-completion/completions
cp tools/client-side/bash_completion $out/share/bash-completion/completions/subversion cp tools/client-side/bash_completion $out/share/bash-completion/completions/subversion
for f in $out/lib/*.la; do for f in $out/lib/*.la; do
substituteInPlace $f --replace "${expat.dev}/lib" "${expat.out}/lib" substituteInPlace $f \
substituteInPlace $f --replace "${zlib.dev}/lib" "${zlib.out}/lib" --replace "${expat.dev}/lib" "${expat.out}/lib" \
substituteInPlace $f --replace "${sqlite.dev}/lib" "${sqlite.out}/lib" --replace "${zlib.dev}/lib" "${zlib.out}/lib" \
done --replace "${sqlite.dev}/lib" "${sqlite.out}/lib" \
--replace "${openssl.dev}/lib" "${openssl.out}/lib"
done
''; '';
inherit perlBindings pythonBindings; inherit perlBindings pythonBindings;