apr-util: Split into multiple outputs

Also fixup more .la files to avoid unnecessary -dev dependencies.
This commit is contained in:
Tuomas Tynkkynen 2015-10-18 14:29:23 +03:00 committed by Vladimír Čunát
parent 55b0097c4c
commit 44742f836d

View File

@ -19,6 +19,9 @@ stdenv.mkDerivation rec {
sha256 = "0bn81pfscy9yjvbmyx442svf43s6dhrdfcsnkpxz43fai5qk5kx6"; sha256 = "0bn81pfscy9yjvbmyx442svf43s6dhrdfcsnkpxz43fai5qk5kx6";
}; };
outputs = [ "dev" "out" ];
outputBin = "dev";
configureFlags = '' configureFlags = ''
--with-apr=${apr} --with-expat=${expat} --with-apr=${apr} --with-expat=${expat}
${optionalString (!stdenv.isCygwin) "--with-crypto"} ${optionalString (!stdenv.isCygwin) "--with-crypto"}
@ -37,8 +40,10 @@ stdenv.mkDerivation rec {
# Give apr1 access to sed for runtime invocations # Give apr1 access to sed for runtime invocations
postInstall = '' postInstall = ''
substituteInPlace $out/lib/libaprutil-1.la --replace "${expat}/lib" "${expat.out}/lib" for f in $out/lib/*.la $out/lib/apr-util-1/*.la; do
wrapProgram $out/bin/apu-1-config --prefix PATH : "${gnused}/bin" substituteInPlace $f --replace "${expat.dev}/lib" "${expat.out}/lib"
done
wrapProgram $dev/bin/apu-1-config --prefix PATH : "${gnused}/bin"
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;