From 387d9b6b3187a122f06e0c1bd1cd6cb6e1995161 Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Thu, 5 Oct 2023 14:20:07 +0200 Subject: [PATCH 1/2] frr: fix cross compilation protobufc is also needed as nativeBuildInput in order for cross compilation to work. Tested for aarch64. Signed-off-by: Markus Theil --- pkgs/servers/frr/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/frr/default.nix b/pkgs/servers/frr/default.nix index d6d016b5e4be..bce35e72496a 100644 --- a/pkgs/servers/frr/default.nix +++ b/pkgs/servers/frr/default.nix @@ -102,6 +102,7 @@ stdenv.mkDerivation rec { pkg-config python3.pkgs.sphinx texinfo + protobufc ]; buildInputs = [ From e6ff73add9d390011a9dbd8ca5c2e7e15e447eb3 Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Fri, 6 Oct 2023 18:49:34 +0200 Subject: [PATCH 2/2] frr: fix supported platforms Signed-off-by: Markus Theil --- pkgs/servers/frr/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/frr/default.nix b/pkgs/servers/frr/default.nix index bce35e72496a..2186e1fc89e3 100644 --- a/pkgs/servers/frr/default.nix +++ b/pkgs/servers/frr/default.nix @@ -228,7 +228,8 @@ stdenv.mkDerivation rec { ''; license = with licenses; [ gpl2Plus lgpl21Plus ]; maintainers = with maintainers; [ woffs thillux ]; - platforms = platforms.unix; + # adapt to platforms stated in http://docs.frrouting.org/en/latest/overview.html#supported-platforms + platforms = (platforms.linux ++ platforms.freebsd ++ platforms.netbsd ++ platforms.openbsd); }; passthru.tests = { inherit (nixosTests) frr; };