Merge pull request #162049 from NickCao/bird

bird: add patch for babel iface reconfiguration
2022-02-28 13:59:23 +00:00 · 2022-02-28 13:59:23 +00:00 · da84a63d71
commit da84a63d71
parent f5030a6258 c25c096d61
2 changed files with 5 additions and 7 deletions
--- a/pkgs/servers/bird/default.nix
+++ b/pkgs/servers/bird/default.nix
@ -13,7 +13,11 @@ stdenv.mkDerivation rec {
  buildInputs = [ readline libssh ];

  patches = [
-    (./. + "/dont-create-sysconfdir-${builtins.substring 0 1 version}.patch")
+    ./dont-create-sysconfdir-2.patch
+    (fetchurl {
+      url = "https://gitlab.nic.cz/labs/bird/-/commit/fcb4dd0c831339c4374ace17d8f2ae6ebfeed279.patch";
+      sha256 = "sha256-PEgpRnOGLa1orHJDEHlblnVhBVv7XOKPR70M1wUMxMQ=";
+    })
  ];

  CPP="${stdenv.cc.targetPrefix}cpp -E";
--- a/pkgs/servers/bird/dont-create-sysconfdir-1.patch
+++ b/pkgs/servers/bird/dont-create-sysconfdir-1.patch
@ -1,6 +0,0 @@
--- a/tools/Makefile.in
-+++ b/tools/Makefile.in
-@@ -68,2 +68,2 @@
- install: all
-	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(runstatedir)
-+	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir)