openldap: Split into multiple outputs
Also fix the incorrect .la file fixups.
This commit is contained in:
parent
75300c334a
commit
b4118c7f04
|
@ -28,10 +28,10 @@ in
|
||||||
example = literalExample ''
|
example = literalExample ''
|
||||||
openldap.enable = true;
|
openldap.enable = true;
|
||||||
openldap.extraConfig = '''
|
openldap.extraConfig = '''
|
||||||
include ''${pkgs.openldap}/etc/openldap/schema/core.schema
|
include ''${pkgs.openldap.out}/etc/openldap/schema/core.schema
|
||||||
include ''${pkgs.openldap}/etc/openldap/schema/cosine.schema
|
include ''${pkgs.openldap.out}/etc/openldap/schema/cosine.schema
|
||||||
include ''${pkgs.openldap}/etc/openldap/schema/inetorgperson.schema
|
include ''${pkgs.openldap.out}/etc/openldap/schema/inetorgperson.schema
|
||||||
include ''${pkgs.openldap}/etc/openldap/schema/nis.schema
|
include ''${pkgs.openldap.out}/etc/openldap/schema/nis.schema
|
||||||
|
|
||||||
database bdb
|
database bdb
|
||||||
suffix dc=example,dc=org
|
suffix dc=example,dc=org
|
||||||
|
@ -89,7 +89,7 @@ in
|
||||||
mkdir -p ${cfg.dataDir}
|
mkdir -p ${cfg.dataDir}
|
||||||
chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}
|
chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}
|
||||||
'';
|
'';
|
||||||
serviceConfig.ExecStart = "${openldap}/libexec/slapd -u ${cfg.user} -g ${cfg.group} -d 0 -f ${configFile}";
|
serviceConfig.ExecStart = "${openldap.out}/libexec/slapd -u ${cfg.user} -g ${cfg.group} -d 0 -f ${configFile}";
|
||||||
};
|
};
|
||||||
|
|
||||||
users.extraUsers.openldap =
|
users.extraUsers.openldap =
|
||||||
|
|
|
@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
|
||||||
# Should be removed with >=2.4.43
|
# Should be removed with >=2.4.43
|
||||||
patches = [ ./CVE-2015-6908.patch ];
|
patches = [ ./CVE-2015-6908.patch ];
|
||||||
|
|
||||||
outputs = [ "out" "man" ];
|
# TODO: separate "out" and "bin"
|
||||||
|
outputs = [ "dev" "out" "man" "docdev" ];
|
||||||
|
|
||||||
buildInputs = [ openssl cyrus_sasl db groff ];
|
buildInputs = [ openssl cyrus_sasl db groff ];
|
||||||
|
|
||||||
|
@ -23,8 +24,8 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
# Fixup broken libtool
|
# Fixup broken libtool
|
||||||
preFixup = ''
|
preFixup = ''
|
||||||
sed -e 's,-lsasl2,-L${cyrus_sasl}/lib -lsasl2,' \
|
sed -e 's,-lsasl2,-L${cyrus_sasl.out}/lib -lsasl2,' \
|
||||||
-e 's,-lssl,-L${openssl}/lib -lssl,' \
|
-e 's,-lssl,-L${openssl.out}/lib -lssl,' \
|
||||||
-i $out/lib/libldap.la -i $out/lib/libldap_r.la
|
-i $out/lib/libldap.la -i $out/lib/libldap_r.la
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue