Unverified Commit 9d92c1d8 authored by Morgan Jones's avatar Morgan Jones
Browse files

frr: clean up config warnings 

- sysconfdir should not have /frr at the end
- --disable-exampledir, --enable-rtadv, & --enable-rr-semantics are
  unsupported
parent 420f5869

pkgs/by-name/fr/frr/package.nix

+1 −6
Original line number Diff line number Diff line
@@ -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")