From 0e07172c6d8eb4527f5cfc173889943e3221e417 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 22 Dec 2015 17:27:35 +0100 Subject: [PATCH] bind: Fix patching Makefile.in There is no postPatchPhase. --- pkgs/servers/dns/bind/default.nix | 6 +----- pkgs/servers/dns/bind/remove-mkdir-var.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 pkgs/servers/dns/bind/remove-mkdir-var.patch diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 64c461b70ea3..a6933653e605 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -10,11 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1w4gp4hdkb452nmz91l413d1rx89isl2l6wv8kpbdd2afpc3phws"; }; - postPatchPhase = '' - sed -i 's/^\t.*run/\t/' Makefile.in - ''; - - patches = [ ./libressl.patch ]; + patches = [ ./libressl.patch ./remove-mkdir-var.patch ]; buildInputs = [ openssl libtool perl libxml2 ]; diff --git a/pkgs/servers/dns/bind/remove-mkdir-var.patch b/pkgs/servers/dns/bind/remove-mkdir-var.patch new file mode 100644 index 000000000000..d0dcd580c20a --- /dev/null +++ b/pkgs/servers/dns/bind/remove-mkdir-var.patch @@ -0,0 +1,12 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -53,8 +53,7 @@ docclean manclean maintainer-clean:: + doc man:: ${MANOBJS} + + installdirs: +- $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir} \ +- ${DESTDIR}${localstatedir}/run ${DESTDIR}${sysconfdir} ++ $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir} ${DESTDIR}${sysconfdir} + $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1 + + install:: isc-config.sh installdirs