From 9d92c1d8a5737bddc2d2a953dc23e0d696152ee1 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Wed, 5 Nov 2025 18:44:48 -0800
Subject: [PATCH] frr: clean up config warnings

- sysconfdir should not have /frr at the end
- --disable-exampledir, --enable-rtadv, & --enable-rr-semantics are
  unsupported
---
 pkgs/by-name/fr/frr/package.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkgs/by-name/fr/frr/package.nix b/pkgs/by-name/fr/frr/package.nix
index b2cda103219a..8094336da5bb 100644
--- a/pkgs/by-name/fr/frr/package.nix
+++ b/pkgs/by-name/fr/frr/package.nix
@@ -43,9 +43,7 @@
   numMultipath ? 64,
   watchfrrSupport ? true,
   cumulusSupport ? false,
-  rtadvSupport ? true,
   irdpSupport ? true,
-  routeReplacementSupport ? true,
   mgmtdSupport ? true,
   # Experimental as of 10.1, reconsider if upstream changes defaults
   grpcSupport ? false,
@@ -151,7 +149,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   configureFlags = [
     "--disable-silent-rules"
-    "--disable-exampledir"
     "--enable-configfile-mask=0640"
     "--enable-group=frr"
     "--enable-logfile-mask=0640"
@@ -160,15 +157,13 @@ stdenv.mkDerivation (finalAttrs: {
     "--enable-vty-group=frrvty"
     "--localstatedir=/var"
     "--sbindir=${placeholder "out"}/libexec/frr"
-    "--sysconfdir=/etc/frr"
+    "--sysconfdir=/etc"
     "--with-clippy=${finalAttrs.clippy-helper}/bin/clippy"
     # general options
     (lib.strings.enableFeature snmpSupport "snmp")
     (lib.strings.enableFeature rpkiSupport "rpki")
     (lib.strings.enableFeature watchfrrSupport "watchfrr")
-    (lib.strings.enableFeature rtadvSupport "rtadv")
     (lib.strings.enableFeature irdpSupport "irdp")
-    (lib.strings.enableFeature routeReplacementSupport "rr-semantics")
     (lib.strings.enableFeature mgmtdSupport "mgmtd")
     (lib.strings.enableFeature grpcSupport "grpc")