pyrox.dev / nixpkgs
lol
fork atom

db: Use more conventional outputs, also split bin

Tuomas Tynkkynen 0fd461d5 f9feacfc

+8 -6
unified split
+1 -1
pkgs/development/libraries/db/generic.nix
··· 20 20 21 21 patches = extraPatches; 22 22 23 - outputs = [ "out" "lib" ]; 23 + outputs = [ "bin" "out" "dev" ]; 24 24 25 25 configureFlags = 26 26 [
+2 -2
pkgs/development/perl-modules/DB_File/default.nix
··· 12 12 cat > config.in <<EOF 13 13 PREFIX = size_t 14 14 HASH = u_int32_t 15 - LIB = ${db.lib}/lib 16 - INCLUDE = ${db}/include 15 + LIB = ${db.out}/lib 16 + INCLUDE = ${db.dev}/include 17 17 EOF 18 18 ''; 19 19 }
+3 -1
pkgs/servers/ldap/389/default.nix
··· 36 36 "--sysconfdir=/etc" 37 37 "--localstatedir=/var" 38 38 "--with-openldap" 39 - "--with-db=${db}" 39 + "--with-db" 40 + "--with-db-inc=${db.dev}/include" 41 + "--with-db-lib=${db.out}/lib" 40 42 "--with-sasl=${cyrus_sasl.dev}" 41 43 "--with-netsnmp=${net_snmp}" 42 44 ];
+1 -1
pkgs/tools/filesystems/netatalk/default.nix
··· 21 21 buildInputs = [ db libgcrypt avahi libiconv pam openssl acl ]; 22 22 23 23 configureFlags = [ 24 - "--with-bdb=${db}" 24 + "--with-bdb=${db.dev}" 25 25 "--with-ssl-dir=${openssl.dev}" 26 26 "--with-lockfile=/run/lock/netatalk" 27 27 "--localstatedir=/var/lib"
+1 -1
pkgs/tools/package-management/apt/default.nix
··· 38 38 export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${Po4a}/lib/perl5"; 39 39 40 40 cmakeFlagsArray+=( 41 - -DBERKELEY_DB_INCLUDE_DIRS="${db}"/include 41 + -DBERKELEY_DB_INCLUDE_DIRS=${db.dev}/include 42 42 -DDOCBOOK_XSL="${docbook_xsl}"/share/xml/docbook-xsl 43 43 -DROOT_GROUP=root 44 44 -DWITH_DOC=${if withDocs then "ON" else "OFF"}