From c1ee0a4980f7b7a5e532a784a619f0b1f5a4b87e Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:31 +0000 Subject: [PATCH] aprutil: move defaults to package file --- pkgs/development/libraries/apr-util/default.nix | 2 +- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index fe159afe6854..87563d6a9cbf 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper, apr, expat, gnused , sslSupport ? true, openssl -, bdbSupport ? false, db +, bdbSupport ? true, db , ldapSupport ? !stdenv.isCygwin, openldap , libiconv , cyrus_sasl, autoreconfHook diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b26c7634ad71..c45ba40ba286 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9272,7 +9272,6 @@ in apr = callPackage ../development/libraries/apr { }; aprutil = callPackage ../development/libraries/apr-util { - bdbSupport = true; db = if stdenv.isFreeBSD then db4 else db; # XXX: only the db_185 interface was available through # apr with db58 on freebsd (nov 2015), for unknown reasons