subversion: Clean up more *.la files

This removes some -dev paths from the closure of subversionClient and
gitFull.
This commit is contained in:
Eelco Dolstra 2017-03-20 15:04:18 +01:00
parent 1824832e17
commit f6c73f1e37
No known key found for this signature in database
GPG Key ID: 8170B4726D7198DE

View File

@ -26,8 +26,8 @@ let
inherit sha256; inherit sha256;
}; };
# 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 openssl ] buildInputs = [ zlib apr aprutil sqlite openssl ]
++ stdenv.lib.optional httpSupport serf ++ stdenv.lib.optional httpSupport serf
@ -75,7 +75,7 @@ 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 $out/lib/python*/site-packages/*/*.la; do
substituteInPlace $f \ substituteInPlace $f \
--replace "${expat.dev}/lib" "${expat.out}/lib" \ --replace "${expat.dev}/lib" "${expat.out}/lib" \
--replace "${zlib.dev}/lib" "${zlib.out}/lib" \ --replace "${zlib.dev}/lib" "${zlib.out}/lib" \