mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-27 05:43:50 +03:00
db: Use more conventional outputs, also split bin
This commit is contained in:
parent
f9feacfc7c
commit
0fd461d5b5
@ -20,7 +20,7 @@ stdenv.mkDerivation (rec {
|
||||
|
||||
patches = extraPatches;
|
||||
|
||||
outputs = [ "out" "lib" ];
|
||||
outputs = [ "bin" "out" "dev" ];
|
||||
|
||||
configureFlags =
|
||||
[
|
||||
|
@ -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
|
||||
'';
|
||||
}
|
||||
|
@ -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}"
|
||||
];
|
||||
|
@ -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"
|
||||
|
@ -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"}
|
||||
|
Loading…
Reference in New Issue
Block a user