summary refs log tree commit diff
path: root/pkgs/development/libraries/apr-util/default.nix
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2014-01-31 14:05:37 -0600
committerBjørn Forsman <bjorn.forsman@gmail.com>2014-02-15 12:03:02 +0100
commitbdb842d5ebb8fd5aea400312373eaeb0126b726c (patch)
tree55f34718f08b778f60095d6faaa8671e7582405a /pkgs/development/libraries/apr-util/default.nix
parent99f5d2edb423194540a2bf83365e7b78b1ffccc9 (diff)
downloadnixpkgs-bdb842d5ebb8fd5aea400312373eaeb0126b726c.tar
nixpkgs-bdb842d5ebb8fd5aea400312373eaeb0126b726c.tar.gz
nixpkgs-bdb842d5ebb8fd5aea400312373eaeb0126b726c.tar.bz2
nixpkgs-bdb842d5ebb8fd5aea400312373eaeb0126b726c.tar.lz
nixpkgs-bdb842d5ebb8fd5aea400312373eaeb0126b726c.tar.xz
nixpkgs-bdb842d5ebb8fd5aea400312373eaeb0126b726c.tar.zst
nixpkgs-bdb842d5ebb8fd5aea400312373eaeb0126b726c.zip
Move all db4 packages to the default db5
Diffstat (limited to 'pkgs/development/libraries/apr-util/default.nix')
-rw-r--r--pkgs/development/libraries/apr-util/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index e2d72fc7d6b..229529f08ce 100644
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/pkgs/development/libraries/apr-util/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, apr, expat, gnused
 , sslSupport ? true, openssl
-, bdbSupport ? false, db4
+, bdbSupport ? false, db
 , ldapSupport ? true, openldap
 }:
 
 assert sslSupport -> openssl != null;
-assert bdbSupport -> db4 != null;
+assert bdbSupport -> db != null;
 assert ldapSupport -> openldap != null;
 
 let
@@ -24,13 +24,13 @@ stdenv.mkDerivation rec {
     --with-apr=${apr} --with-expat=${expat}
     --with-crypto
     ${stdenv.lib.optionalString sslSupport "--with-openssl=${openssl}"}
-    ${stdenv.lib.optionalString bdbSupport "--with-berkeley-db=${db4}"}
+    ${stdenv.lib.optionalString bdbSupport "--with-berkeley-db=${db}"}
     ${stdenv.lib.optionalString ldapSupport "--with-ldap"}
   '';
 
   propagatedBuildInputs = [ makeWrapper apr expat ]
     ++ optional sslSupport openssl
-    ++ optional bdbSupport db4
+    ++ optional bdbSupport db
     ++ optional ldapSupport openldap;
 
   # Give apr1 access to sed for runtime invocations