From 6abfb2bd641ce68c3180bc420152629db511e7bf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 22 Sep 2016 16:53:09 +0200 Subject: [PATCH] apr-util: Drop dependency on openssl.dev in out --- pkgs/development/libraries/apr-util/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 81e8a8a52f9..1829b3306eb 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -43,11 +43,14 @@ stdenv.mkDerivation rec { ++ optional ldapSupport openldap ++ optional stdenv.isFreeBSD cyrus_sasl; - # Give apr1 access to sed for runtime invocations postInstall = '' for f in $out/lib/*.la $out/lib/apr-util-1/*.la; do - substituteInPlace $f --replace "${expat.dev}/lib" "${expat.out}/lib" + substituteInPlace $f \ + --replace "${expat.dev}/lib" "${expat.out}/lib" \ + --replace "${openssl.dev}/lib" "${openssl.out}/lib" done + + # Give apr1 access to sed for runtime invocations. wrapProgram $dev/bin/apu-1-config --prefix PATH : "${gnused}/bin" '';