diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2015-10-18 14:29:23 +0300 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-28 10:22:59 +0100 |
| commit | 44742f836d5bc57c1df0bbde3411e5425ed7afb9 (patch) | |
| tree | d5d476e42766f0706727148165577dda490f9738 /pkgs/development/libraries/apr-util/default.nix | |
| parent | 55b0097c4c78ff0b527df9e6cfc3164593896903 (diff) | |
| download | nixpkgs-44742f836d5bc57c1df0bbde3411e5425ed7afb9.tar nixpkgs-44742f836d5bc57c1df0bbde3411e5425ed7afb9.tar.gz nixpkgs-44742f836d5bc57c1df0bbde3411e5425ed7afb9.tar.bz2 nixpkgs-44742f836d5bc57c1df0bbde3411e5425ed7afb9.tar.lz nixpkgs-44742f836d5bc57c1df0bbde3411e5425ed7afb9.tar.xz nixpkgs-44742f836d5bc57c1df0bbde3411e5425ed7afb9.tar.zst nixpkgs-44742f836d5bc57c1df0bbde3411e5425ed7afb9.zip | |
apr-util: Split into multiple outputs
Also fixup more .la files to avoid unnecessary -dev dependencies.
Diffstat (limited to 'pkgs/development/libraries/apr-util/default.nix')
| -rw-r--r-- | pkgs/development/libraries/apr-util/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 2832bc724c8..f1c0807144b 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -19,6 +19,9 @@ stdenv.mkDerivation rec { sha256 = "0bn81pfscy9yjvbmyx442svf43s6dhrdfcsnkpxz43fai5qk5kx6"; }; + outputs = [ "dev" "out" ]; + outputBin = "dev"; + configureFlags = '' --with-apr=${apr} --with-expat=${expat} ${optionalString (!stdenv.isCygwin) "--with-crypto"} @@ -37,8 +40,10 @@ stdenv.mkDerivation rec { # Give apr1 access to sed for runtime invocations postInstall = '' - substituteInPlace $out/lib/libaprutil-1.la --replace "${expat}/lib" "${expat.out}/lib" - wrapProgram $out/bin/apu-1-config --prefix PATH : "${gnused}/bin" + for f in $out/lib/*.la $out/lib/apr-util-1/*.la; do + substituteInPlace $f --replace "${expat.dev}/lib" "${expat.out}/lib" + done + wrapProgram $dev/bin/apu-1-config --prefix PATH : "${gnused}/bin" ''; enableParallelBuilding = true; |