diff options
Diffstat (limited to 'pkgs/applications')
8 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index 74ae3dcf22bb3..5356d4ce298a8 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg_0_10, libvorbis, mpc, libsndfile, jackaudio, db4, libmodplug, timidity, libid3tag, libtool }: +{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg_0_10, libvorbis, mpc, libsndfile, jackaudio, db, libmodplug, timidity, libid3tag, libtool }: stdenv.mkDerivation rec { name = "moc-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { configurePhase = "./configure prefix=$out"; - buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg_0_10 libvorbis mpc libsndfile jackaudio db4 libmodplug timidity libid3tag libtool ]; + buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg_0_10 libvorbis mpc libsndfile jackaudio db libmodplug timidity libid3tag libtool ]; meta = { description = "MOC (music on console) is a console audio player for LINUX/UNIX designed to be powerful and easy to use."; diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix index 9e20be0dcbcde..1785526d14a96 100644 --- a/pkgs/applications/misc/bitcoin/default.nix +++ b/pkgs/applications/misc/bitcoin/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, openssl, db4, boost, zlib, miniupnpc, qt4 }: +{ fetchurl, stdenv, openssl, db, boost, zlib, miniupnpc, qt4 }: stdenv.mkDerivation rec { version = "0.8.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "036xx06gyrfh65rpdapff3viz1f38vzkj7lnhil6fc0s7pjmsjbk"; }; - buildInputs = [ openssl db4 boost zlib miniupnpc qt4 ]; + buildInputs = [ openssl db boost zlib miniupnpc qt4 ]; configurePhase = '' cd src diff --git a/pkgs/applications/misc/freicoin/default.nix b/pkgs/applications/misc/freicoin/default.nix index d5ed057f56b8b..33d8585bb2dd6 100644 --- a/pkgs/applications/misc/freicoin/default.nix +++ b/pkgs/applications/misc/freicoin/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, db4, boost, gmp, mpfr, miniupnpc, qt4, unzip }: +{ fetchurl, stdenv, db, boost, gmp, mpfr, miniupnpc, qt4, unzip }: stdenv.mkDerivation rec { version = "0.8.3-1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # I think that openssl and zlib are required, but come through other # packages - buildInputs = [ db4 boost gmp mpfr miniupnpc qt4 unzip ]; + buildInputs = [ db boost gmp mpfr miniupnpc qt4 unzip ]; configurePhase = "qmake"; diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix index 24edc0e128a75..fe4c0287fdd2b 100644 --- a/pkgs/applications/misc/jigdo/default.nix +++ b/pkgs/applications/misc/jigdo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, db4, gtk, bzip2 }: +{ stdenv, fetchurl, db, gtk, bzip2 }: stdenv.mkDerivation { name = "jigdo-0.7.3"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "0jnlzm9m2hjlnw0zs2fv456ml5r2jj2q1lncqbrgg52lq18f6fa3"; }; - buildInputs = [ db4 gtk bzip2 ]; + buildInputs = [ db gtk bzip2 ]; configureFlags = "--without-libdb"; diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index 276df1ae7a158..9de14cae6f0f6 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -2,7 +2,7 @@ x@{builderDefsPackage , cyrus_sasl, gettext, openldap, ptlib, opal, GConf, libXv, rarian, intltool , perl, perlXMLParser, evolution_data_server, gnome_doc_utils, avahi , libsigcxx, gtk, dbus_glib, libnotify, libXext, xextproto, automake - , autoconf, pkgconfig, libxml2, videoproto, unixODBC, db4, nspr, nss, zlib + , autoconf, pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib , libXrandr, randrproto, which, libxslt, libtasn1, gmp, nettle , ...}: builderDefsPackage diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 67cbd7996ffc0..58e657f8b2e7a 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -6,7 +6,7 @@ { stdenv, fetchurl, pam, python3, tcsh, libxslt, perl, ArchiveZip , CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd -, libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon +, libxml2, db, sablotron, curl, libXaw, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups , libXinerama, openssl, gperf, cppunit, GConf, ORBit2, poppler @@ -248,7 +248,7 @@ stdenv.mkDerivation rec { buildInputs = [ ant ArchiveZip autoconf automake bison boost cairo clucene_core - CompressZlib cppunit cups curl db4 dbus_glib expat file flex fontconfig + CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig freetype GConf getopt gnome_vfs gperf gst_plugins_base gstreamer gtk hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 diff --git a/pkgs/applications/version-management/codeville/0.8.0.nix b/pkgs/applications/version-management/codeville/0.8.0.nix index 5c1910d6c6f6c..0c0f3c4c19c03 100644 --- a/pkgs/applications/version-management/codeville/0.8.0.nix +++ b/pkgs/applications/version-management/codeville/0.8.0.nix @@ -1,6 +1,6 @@ args : with args; -if (! python ? db4Support) || (! python.db4Support) then +if (! python ? dbSupport) || (! python.dbSupport) then throw ''Python DB4 support is required for codeville.'' else diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix index 6373eb9f7f971..60f5d8bb9e08d 100644 --- a/pkgs/applications/version-management/kdesvn/default.nix +++ b/pkgs/applications/version-management/kdesvn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, apr, aprutil, subversion, db4, kdelibs, expat }: +{ stdenv, fetchurl, gettext, apr, aprutil, subversion, db, kdelibs, expat }: # the homepage mentions this is the final release. # from now on, kdesvn will be part of the official kde software distribution @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sed -i -e "s|/usr|${subversion}|g" src/svnqt/cmakemodules/FindSubversion.cmake ''; - buildInputs = [ apr aprutil subversion db4 kdelibs expat ]; + buildInputs = [ apr aprutil subversion db kdelibs expat ]; nativeBuildInputs = [ gettext ]; |