389-ds-base: Fix build

2 files changed, 60 insertions, 2 deletions

diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix
index 1c0b0cd00430..658c35289be2 100644
--- a/pkgs/servers/ldap/389/default.nix
+++ b/pkgs/servers/ldap/389/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, perl, pam, nspr, nss, openldap, db, cyrus_sasl
-, svrcore, icu, net_snmp, krb5, pcre
+, svrcore, icu, net_snmp, kerberos, pcre
 }:
 
 stdenv.mkDerivation rec {
@@ -12,17 +12,25 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig perl pam nspr nss openldap db cyrus_sasl svrcore icu
-    net_snmp krb5 pcre
+    net_snmp kerberos pcre
   ];
 
+  patches = [ ./no-etc.patch ];
+
   configureFlags = [
     "--sysconfdir=/etc"
+    "--localstatedir=/var"
     "--with-openldap=${openldap}"
     "--with-db=${db}"
     "--with-sasl=${cyrus_sasl}"
     "--with-netsnmp=${net_snmp}"
   ];
   
+  preInstall = ''
+    # The makefile doesn't create this directory for whatever reason
+    mkdir -p $out/lib/dirsrv
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://directory.fedoraproject.org/;
     description = "enterprise-class Open Source LDAP server for Linux";
diff --git a/pkgs/servers/ldap/389/no-etc.patch b/pkgs/servers/ldap/389/no-etc.patch
new file mode 100644
index 000000000000..c3dcd79363ea
--- /dev/null
+++ b/pkgs/servers/ldap/389/no-etc.patch
@@ -0,0 +1,50 @@
+diff --git a/Makefile.in b/Makefile.in
+index 24a9ddf..c97d1e1 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -169,15 +169,14 @@ am__uninstall_files_from_dir = { \
+ am__installdirs = "$(DESTDIR)$(serverdir)" \
+ 	"$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" \
+ 	"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" \
+-	"$(DESTDIR)$(initdir)" "$(DESTDIR)$(sbindir)" \
++	"$(DESTDIR)$(sbindir)" \
+ 	"$(DESTDIR)$(taskdir)" "$(DESTDIR)$(updatedir)" \
+ 	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)" \
+-	"$(DESTDIR)$(configdir)" "$(DESTDIR)$(infdir)" \
+-	"$(DESTDIR)$(initconfigdir)" "$(DESTDIR)$(mibdir)" \
++	"$(DESTDIR)$(infdir)" \
++	"$(DESTDIR)$(mibdir)" \
+ 	"$(DESTDIR)$(propertydir)" "$(DESTDIR)$(perldir)" \
+ 	"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(propertydir)" \
+ 	"$(DESTDIR)$(pythondir)" "$(DESTDIR)$(sampledatadir)" \
+-	"$(DESTDIR)$(schemadir)" "$(DESTDIR)$(systemdsystemunitdir)" \
+ 	"$(DESTDIR)$(updatedir)" "$(DESTDIR)$(serverincdir)"
+ LTLIBRARIES = $(server_LTLIBRARIES) $(serverplugin_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+@@ -10207,7 +10206,7 @@ check: $(BUILT_SOURCES)
+ all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \
+ 		$(MANS) $(DATA) $(HEADERS) config.h
+ installdirs:
+-	for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(initconfigdir)" "$(DESTDIR)$(mibdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(pythondir)" "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(systemdsystemunitdir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(serverincdir)"; do \
++	for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(mibdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(pythondir)" "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(serverincdir)"; do \
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: $(BUILT_SOURCES)
+@@ -10363,13 +10362,13 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am: install-configDATA install-infDATA \
+-	install-initSCRIPTS install-initconfigDATA install-man \
++install-data-am: install-infDATA \
++	install-man \
+ 	install-mibDATA install-nodist_propertyDATA install-perlDATA \
+ 	install-pkgconfigDATA install-propertyDATA install-pythonDATA \
+-	install-sampledataDATA install-schemaDATA \
++	install-sampledataDATA \
+ 	install-serverLTLIBRARIES install-serverincHEADERS \
+-	install-serverpluginLTLIBRARIES install-systemdsystemunitDATA \
++	install-serverpluginLTLIBRARIES \
+ 	install-taskSCRIPTS install-updateDATA install-updateSCRIPTS
+ 
+ install-dvi: install-dvi-am