diff options
| author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2015-05-21 03:24:20 +0300 |
|---|---|---|
| committer | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2015-05-21 03:24:20 +0300 |
| commit | a9171953c65ac3a6330435ee2d551d8859bbb08f (patch) | |
| tree | 71db932145d320a361b74d26abeed57b7dbe6fc3 /pkgs/servers | |
| parent | bfc1582b81937b24466a4e20d4dbbb1830c14108 (diff) | |
| parent | 9d07c54fa11bc577f8fc946aef9be9d059d4f40a (diff) | |
| download | nixlib-a9171953c65ac3a6330435ee2d551d8859bbb08f.tar nixlib-a9171953c65ac3a6330435ee2d551d8859bbb08f.tar.gz nixlib-a9171953c65ac3a6330435ee2d551d8859bbb08f.tar.bz2 nixlib-a9171953c65ac3a6330435ee2d551d8859bbb08f.tar.lz nixlib-a9171953c65ac3a6330435ee2d551d8859bbb08f.tar.xz nixlib-a9171953c65ac3a6330435ee2d551d8859bbb08f.tar.zst nixlib-a9171953c65ac3a6330435ee2d551d8859bbb08f.zip | |
Merge pull request #7860 from Lassulus/bird
nixos: add bird module
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/bird/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/servers/bird/dont-create-sysconfdir.patch | 13 |
2 files changed, 21 insertions, 0 deletions
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 \ |