db: Use more conventional outputs, also split bin

This commit is contained in:
Tuomas Tynkkynen 2018-05-22 16:47:28 +03:00
parent f9feacfc7c
commit 0fd461d5b5
5 changed files with 8 additions and 6 deletions

View File

@ -20,7 +20,7 @@ stdenv.mkDerivation (rec {
patches = extraPatches; patches = extraPatches;
outputs = [ "out" "lib" ]; outputs = [ "bin" "out" "dev" ];
configureFlags = configureFlags =
[ [

View File

@ -12,8 +12,8 @@ buildPerlPackage rec {
cat > config.in <<EOF cat > config.in <<EOF
PREFIX = size_t PREFIX = size_t
HASH = u_int32_t HASH = u_int32_t
LIB = ${db.lib}/lib LIB = ${db.out}/lib
INCLUDE = ${db}/include INCLUDE = ${db.dev}/include
EOF EOF
''; '';
} }

View File

@ -36,7 +36,9 @@ stdenv.mkDerivation rec {
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--localstatedir=/var" "--localstatedir=/var"
"--with-openldap" "--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-sasl=${cyrus_sasl.dev}"
"--with-netsnmp=${net_snmp}" "--with-netsnmp=${net_snmp}"
]; ];

View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec{
buildInputs = [ db libgcrypt avahi libiconv pam openssl acl ]; buildInputs = [ db libgcrypt avahi libiconv pam openssl acl ];
configureFlags = [ configureFlags = [
"--with-bdb=${db}" "--with-bdb=${db.dev}"
"--with-ssl-dir=${openssl.dev}" "--with-ssl-dir=${openssl.dev}"
"--with-lockfile=/run/lock/netatalk" "--with-lockfile=/run/lock/netatalk"
"--localstatedir=/var/lib" "--localstatedir=/var/lib"

View File

@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${Po4a}/lib/perl5"; export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${Po4a}/lib/perl5";
cmakeFlagsArray+=( cmakeFlagsArray+=(
-DBERKELEY_DB_INCLUDE_DIRS="${db}"/include -DBERKELEY_DB_INCLUDE_DIRS=${db.dev}/include
-DDOCBOOK_XSL="${docbook_xsl}"/share/xml/docbook-xsl -DDOCBOOK_XSL="${docbook_xsl}"/share/xml/docbook-xsl
-DROOT_GROUP=root -DROOT_GROUP=root
-DWITH_DOC=${if withDocs then "ON" else "OFF"} -DWITH_DOC=${if withDocs then "ON" else "OFF"}