tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
db: Use more conventional outputs, also split bin
Tuomas Tynkkynen
7 years ago
0fd461d5
f9feacfc
+8
-6
5 changed files
expand all
collapse all
unified
split
pkgs
development
libraries
db
generic.nix
perl-modules
DB_File
default.nix
servers
ldap
389
default.nix
tools
filesystems
netatalk
default.nix
package-management
apt
default.nix
+1
-1
pkgs/development/libraries/db/generic.nix
···
20
21
patches = extraPatches;
22
23
-
outputs = [ "out" "lib" ];
24
25
configureFlags =
26
[
···
20
21
patches = extraPatches;
22
23
+
outputs = [ "bin" "out" "dev" ];
24
25
configureFlags =
26
[
+2
-2
pkgs/development/perl-modules/DB_File/default.nix
···
12
cat > config.in <<EOF
13
PREFIX = size_t
14
HASH = u_int32_t
15
-
LIB = ${db.lib}/lib
16
-
INCLUDE = ${db}/include
17
EOF
18
'';
19
}
···
12
cat > config.in <<EOF
13
PREFIX = size_t
14
HASH = u_int32_t
15
+
LIB = ${db.out}/lib
16
+
INCLUDE = ${db.dev}/include
17
EOF
18
'';
19
}
+3
-1
pkgs/servers/ldap/389/default.nix
···
36
"--sysconfdir=/etc"
37
"--localstatedir=/var"
38
"--with-openldap"
39
-
"--with-db=${db}"
0
0
40
"--with-sasl=${cyrus_sasl.dev}"
41
"--with-netsnmp=${net_snmp}"
42
];
···
36
"--sysconfdir=/etc"
37
"--localstatedir=/var"
38
"--with-openldap"
39
+
"--with-db"
40
+
"--with-db-inc=${db.dev}/include"
41
+
"--with-db-lib=${db.out}/lib"
42
"--with-sasl=${cyrus_sasl.dev}"
43
"--with-netsnmp=${net_snmp}"
44
];
+1
-1
pkgs/tools/filesystems/netatalk/default.nix
···
21
buildInputs = [ db libgcrypt avahi libiconv pam openssl acl ];
22
23
configureFlags = [
24
-
"--with-bdb=${db}"
25
"--with-ssl-dir=${openssl.dev}"
26
"--with-lockfile=/run/lock/netatalk"
27
"--localstatedir=/var/lib"
···
21
buildInputs = [ db libgcrypt avahi libiconv pam openssl acl ];
22
23
configureFlags = [
24
+
"--with-bdb=${db.dev}"
25
"--with-ssl-dir=${openssl.dev}"
26
"--with-lockfile=/run/lock/netatalk"
27
"--localstatedir=/var/lib"
+1
-1
pkgs/tools/package-management/apt/default.nix
···
38
export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${Po4a}/lib/perl5";
39
40
cmakeFlagsArray+=(
41
-
-DBERKELEY_DB_INCLUDE_DIRS="${db}"/include
42
-DDOCBOOK_XSL="${docbook_xsl}"/share/xml/docbook-xsl
43
-DROOT_GROUP=root
44
-DWITH_DOC=${if withDocs then "ON" else "OFF"}
···
38
export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${Po4a}/lib/perl5";
39
40
cmakeFlagsArray+=(
41
+
-DBERKELEY_DB_INCLUDE_DIRS=${db.dev}/include
42
-DDOCBOOK_XSL="${docbook_xsl}"/share/xml/docbook-xsl
43
-DROOT_GROUP=root
44
-DWITH_DOC=${if withDocs then "ON" else "OFF"}