diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2015-10-18 16:07:03 +0300 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-28 10:23:00 +0100 |
| commit | b4118c7f0429a4f0d96fc5f67a4b254429b6e915 (patch) | |
| tree | 0a9dbf244699e09be6ed7af5d49398cc605cad82 | |
| parent | 75300c334addfe1ba61b0b179c1c05acd16f9b4c (diff) | |
| download | nixpkgs-b4118c7f0429a4f0d96fc5f67a4b254429b6e915.tar nixpkgs-b4118c7f0429a4f0d96fc5f67a4b254429b6e915.tar.gz nixpkgs-b4118c7f0429a4f0d96fc5f67a4b254429b6e915.tar.bz2 nixpkgs-b4118c7f0429a4f0d96fc5f67a4b254429b6e915.tar.lz nixpkgs-b4118c7f0429a4f0d96fc5f67a4b254429b6e915.tar.xz nixpkgs-b4118c7f0429a4f0d96fc5f67a4b254429b6e915.tar.zst nixpkgs-b4118c7f0429a4f0d96fc5f67a4b254429b6e915.zip | |
openldap: Split into multiple outputs
Also fix the incorrect .la file fixups.
| -rw-r--r-- | nixos/modules/services/databases/openldap.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/openldap/default.nix | 7 |
2 files changed, 9 insertions, 8 deletions
diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index 29bdb201752..7eecf5d8e44 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -28,10 +28,10 @@ in example = literalExample '' openldap.enable = true; openldap.extraConfig = ''' - include ''${pkgs.openldap}/etc/openldap/schema/core.schema - include ''${pkgs.openldap}/etc/openldap/schema/cosine.schema - include ''${pkgs.openldap}/etc/openldap/schema/inetorgperson.schema - include ''${pkgs.openldap}/etc/openldap/schema/nis.schema + include ''${pkgs.openldap.out}/etc/openldap/schema/core.schema + include ''${pkgs.openldap.out}/etc/openldap/schema/cosine.schema + include ''${pkgs.openldap.out}/etc/openldap/schema/inetorgperson.schema + include ''${pkgs.openldap.out}/etc/openldap/schema/nis.schema database bdb suffix dc=example,dc=org @@ -89,7 +89,7 @@ in mkdir -p ${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 = diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index c1ff70e3dad..e9895ff56a0 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { # Should be removed with >=2.4.43 patches = [ ./CVE-2015-6908.patch ]; - outputs = [ "out" "man" ]; + # TODO: separate "out" and "bin" + outputs = [ "dev" "out" "man" "docdev" ]; buildInputs = [ openssl cyrus_sasl db groff ]; @@ -23,8 +24,8 @@ stdenv.mkDerivation rec { # Fixup broken libtool preFixup = '' - sed -e 's,-lsasl2,-L${cyrus_sasl}/lib -lsasl2,' \ - -e 's,-lssl,-L${openssl}/lib -lssl,' \ + sed -e 's,-lsasl2,-L${cyrus_sasl.out}/lib -lsasl2,' \ + -e 's,-lssl,-L${openssl.out}/lib -lssl,' \ -i $out/lib/libldap.la -i $out/lib/libldap_r.la ''; |