From 0fd461d5b5da30462dfbcec3d3a2bd426700800c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 22 May 2018 16:47:28 +0300
Subject: [PATCH] db: Use more conventional outputs, also split bin

---
 pkgs/development/libraries/db/generic.nix         | 2 +-
 pkgs/development/perl-modules/DB_File/default.nix | 4 ++--
 pkgs/servers/ldap/389/default.nix                 | 4 +++-
 pkgs/tools/filesystems/netatalk/default.nix       | 2 +-
 pkgs/tools/package-management/apt/default.nix     | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix
index d4398692a4e6..06dde2ad4078 100644
--- a/pkgs/development/libraries/db/generic.nix
+++ b/pkgs/development/libraries/db/generic.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (rec {
 
   patches = extraPatches;
 
-  outputs = [ "out" "lib" ];
+  outputs = [ "bin" "out" "dev" ];
 
   configureFlags =
     [
diff --git a/pkgs/development/perl-modules/DB_File/default.nix b/pkgs/development/perl-modules/DB_File/default.nix
index b6158a61da5f..9d189de77c4e 100644
--- a/pkgs/development/perl-modules/DB_File/default.nix
+++ b/pkgs/development/perl-modules/DB_File/default.nix
@@ -12,8 +12,8 @@ buildPerlPackage rec {
     cat > config.in <<EOF
     PREFIX = size_t
     HASH = u_int32_t
-    LIB = ${db.lib}/lib
-    INCLUDE = ${db}/include
+    LIB = ${db.out}/lib
+    INCLUDE = ${db.dev}/include
     EOF
   '';
 }
diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix
index 5ef909a6d09c..6826df5f6e86 100644
--- a/pkgs/servers/ldap/389/default.nix
+++ b/pkgs/servers/ldap/389/default.nix
@@ -36,7 +36,9 @@ stdenv.mkDerivation rec {
     "--sysconfdir=/etc"
     "--localstatedir=/var"
     "--with-openldap"
-    "--with-db=${db}"
+    "--with-db"
+    "--with-db-inc=${db.dev}/include"
+    "--with-db-lib=${db.out}/lib"
     "--with-sasl=${cyrus_sasl.dev}"
     "--with-netsnmp=${net_snmp}"
   ];
diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix
index 33b473df5a22..797ce40a561f 100644
--- a/pkgs/tools/filesystems/netatalk/default.nix
+++ b/pkgs/tools/filesystems/netatalk/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec{
   buildInputs = [ db libgcrypt avahi libiconv pam openssl acl ];
 
   configureFlags = [
-    "--with-bdb=${db}"
+    "--with-bdb=${db.dev}"
     "--with-ssl-dir=${openssl.dev}"
     "--with-lockfile=/run/lock/netatalk"
     "--localstatedir=/var/lib"
diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix
index 8077fb1d93d0..b2d5e96f391c 100644
--- a/pkgs/tools/package-management/apt/default.nix
+++ b/pkgs/tools/package-management/apt/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${Po4a}/lib/perl5";
 
     cmakeFlagsArray+=(
-      -DBERKELEY_DB_INCLUDE_DIRS="${db}"/include
+      -DBERKELEY_DB_INCLUDE_DIRS=${db.dev}/include
       -DDOCBOOK_XSL="${docbook_xsl}"/share/xml/docbook-xsl
       -DROOT_GROUP=root
       -DWITH_DOC=${if withDocs then "ON" else "OFF"}