From 9d07c54fa11bc577f8fc946aef9be9d059d4f40a Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sat, 16 May 2015 23:22:35 +0200
Subject: nixos: add bird module

patch bird to look in /var/run for birc.ctl
---
 pkgs/servers/bird/default.nix                  |  8 ++++++++
 pkgs/servers/bird/dont-create-sysconfdir.patch | 13 +++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/servers/bird/dont-create-sysconfdir.patch

(limited to 'pkgs/servers')

diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix
index 9b17551a8cbb..c13ad64fca3f 100644
--- a/pkgs/servers/bird/default.nix
+++ b/pkgs/servers/bird/default.nix
@@ -10,6 +10,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ flex bison readline ];
 
+  patches = [
+    ./dont-create-sysconfdir.patch
+  ];
+
+  configureFlags = [
+    "--localstatedir /var"
+  ];
+
   meta = {
     description = "BIRD Internet Routing Daemon";
     homepage = http://bird.network.cz;
diff --git a/pkgs/servers/bird/dont-create-sysconfdir.patch b/pkgs/servers/bird/dont-create-sysconfdir.patch
new file mode 100644
index 000000000000..0a11c8a2a8d8
--- /dev/null
+++ b/pkgs/servers/bird/dont-create-sysconfdir.patch
@@ -0,0 +1,13 @@
+diff --git a/tools/Makefile.in b/tools/Makefile.in
+index 062ba91..4fd7453 100644
+--- a/tools/Makefile.in
++++ b/tools/Makefile.in
+@@ -68,7 +68,7 @@ tags:
+ 	cd $(srcdir) ; etags -lc `find $(static-dirs) $(addprefix $(objdir)/,$(dynamic-dirs)) $(client-dirs) -name *.[chY]`
+ 
+ install: all
+-	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/@runtimedir@
++	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir)
+ 	$(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX@
+ 	$(INSTALL_PROGRAM) $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl@SUFFIX@
+ 	if test -n "@CLIENT@" ; then								\
-- 
cgit 1.4.1