diff options
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/apr-util/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/cyrus-sasl/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/kerberos/heimdal.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/libchop/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/librdf/redland.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/log4cxx/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/openldap/default.nix | 4 |
7 files changed, 17 insertions, 17 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 diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index e90ec422661..712f05b8d65 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, db4, gettext, pam }: +{ stdenv, fetchurl, openssl, db, gettext, pam }: stdenv.mkDerivation rec { name = "cyrus-sasl-2.1.26"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1hvvbcsg21nlncbgs0cgn3iwlnb3vannzwsp6rwvnn9ba4v53g4g"; }; - buildInputs = [ openssl db4 gettext ] ++ stdenv.lib.optional stdenv.isLinux pam; + buildInputs = [ openssl db gettext ] ++ stdenv.lib.optional stdenv.isLinux pam; patches = [ ./missing-size_t.patch ]; # https://bugzilla.redhat.com/show_bug.cgi?id=906519 patchFlags = "-p0"; diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index d4728273d34..8f4138282f0 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openldap, readline, db4, openssl, cyrus_sasl, sqlite} : +{ stdenv, fetchurl, openldap, readline, db, openssl, cyrus_sasl, sqlite} : stdenv.mkDerivation rec { name = "heimdal-1.5.3"; @@ -23,5 +23,5 @@ stdenv.mkDerivation rec { rmdir $out/libexec ''; - propagatedBuildInputs = [ readline db4 openssl openldap cyrus_sasl sqlite]; + propagatedBuildInputs = [ readline db openssl openldap cyrus_sasl sqlite]; } diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix index 9a1b4122365..1b16d361c6d 100644 --- a/pkgs/development/libraries/libchop/default.nix +++ b/pkgs/development/libraries/libchop/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, zlib, bzip2, libgcrypt, gdbm, gperf, tdb, gnutls, db4 +{ fetchurl, stdenv, zlib, bzip2, libgcrypt, gdbm, gperf, tdb, gnutls, db , libuuid, lzo, pkgconfig, guile }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib bzip2 lzo libgcrypt - gdbm db4 tdb + gdbm db tdb gnutls libuuid guile ]; diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix index 26b3de70dcd..4863c928988 100644 --- a/pkgs/development/libraries/librdf/redland.nix +++ b/pkgs/development/libraries/librdf/redland.nix @@ -3,7 +3,7 @@ , mysql, withMysql ? false , postgresql, withPostgresql ? false , sqlite, withSqlite ? true -, db4, withBdb ? false +, db, withBdb ? false }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional withMysql mysql ++ stdenv.lib.optional withSqlite sqlite ++ stdenv.lib.optional withPostgresql postgresql - ++ stdenv.lib.optional withBdb db4; + ++ stdenv.lib.optional withBdb db; propagatedBuildInputs = [ librdf_rasqal ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-threads" ] - ++ stdenv.lib.optional withBdb "--with-bdb=${db4}"; + ++ stdenv.lib.optional withBdb "--with-bdb=${db}"; meta = { homepage = http://librdf.org/; diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix index e62fa2fa1c5..b2e13a1e9ab 100644 --- a/pkgs/development/libraries/log4cxx/default.nix +++ b/pkgs/development/libraries/log4cxx/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoconf, automake, libtool, libxml2, cppunit, boost -, apr, aprutil, db4, expat +, apr, aprutil, db, expat }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src/main/cpp/socketoutputstream.cpp ''; - buildInputs = [autoconf automake libtool libxml2 cppunit boost apr aprutil db4 expat]; + buildInputs = [autoconf automake libtool libxml2 cppunit boost apr aprutil db expat]; meta = { homepage = http://logging.apache.org/log4cxx/index.html; diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 8f26f29c377..c4be3358049 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openssl, cyrus_sasl, db4, groff}: +{stdenv, fetchurl, openssl, cyrus_sasl, db, groff}: stdenv.mkDerivation rec { name = "openldap-2.4.38"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1l8zng86alhcmmmw09r1c4dzl7yvk6dy5fq9zia96pgck4srl848"; }; - buildInputs = [ openssl cyrus_sasl db4 groff ]; + buildInputs = [ openssl cyrus_sasl db groff ]; configureFlags = [ "--enable-overlays" |