diff options
author | William A. Kennington III <william@wkennington.com> | 2013-12-31 08:00:21 -0600 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2013-12-31 08:00:21 -0600 |
commit | 844ab16b9007bbd0f18b388c9f7feba6713f3994 (patch) | |
tree | b5e7b0501046fbfc07baa764abf8a37d08dc2f11 /pkgs/development/libraries/apr-util/default.nix | |
parent | 184dd198fbcdc1b392f56791702ba4b4d733b991 (diff) | |
download | nixpkgs-844ab16b9007bbd0f18b388c9f7feba6713f3994.tar nixpkgs-844ab16b9007bbd0f18b388c9f7feba6713f3994.tar.gz nixpkgs-844ab16b9007bbd0f18b388c9f7feba6713f3994.tar.bz2 nixpkgs-844ab16b9007bbd0f18b388c9f7feba6713f3994.tar.lz nixpkgs-844ab16b9007bbd0f18b388c9f7feba6713f3994.tar.xz nixpkgs-844ab16b9007bbd0f18b388c9f7feba6713f3994.tar.zst nixpkgs-844ab16b9007bbd0f18b388c9f7feba6713f3994.zip |
apr-util: Cleanup
Add the required packages to buildInputs. Create a wrapper around apr-1-config so that internal sed commands succeed.
Diffstat (limited to 'pkgs/development/libraries/apr-util/default.nix')
-rw-r--r-- | pkgs/development/libraries/apr-util/default.nix | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 89c2c31ef7a..e2d72fc7d6b 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, apr, expat +{ stdenv, fetchurl, makeWrapper, apr, expat, gnused , sslSupport ? true, openssl , bdbSupport ? false, db4 , ldapSupport ? true, openldap @@ -8,6 +8,10 @@ assert sslSupport -> openssl != null; assert bdbSupport -> db4 != null; assert ldapSupport -> openldap != null; +let + optional = stdenv.lib.optional; +in + stdenv.mkDerivation rec { name = "apr-util-1.5.3"; @@ -24,7 +28,15 @@ stdenv.mkDerivation rec { ${stdenv.lib.optionalString ldapSupport "--with-ldap"} ''; - propagatedBuildInputs = stdenv.lib.optional ldapSupport openldap; + propagatedBuildInputs = [ makeWrapper apr expat ] + ++ optional sslSupport openssl + ++ optional bdbSupport db4 + ++ optional ldapSupport openldap; + + # Give apr1 access to sed for runtime invocations + postInstall = '' + wrapProgram $out/bin/apu-1-config --prefix PATH : "${gnused}/bin" + ''; enableParallelBuilding = true; |