diff options
| author | Philip Taron <philip.taron@gmail.com> | 2024-04-03 10:00:02 -0700 |
|---|---|---|
| committer | Philip Taron <philip.taron@gmail.com> | 2024-04-03 10:04:58 -0700 |
| commit | 5b17986c928ecf33097a504d53e15d7e8b6796fb (patch) | |
| tree | 3725698311ef4921370a3ad047a743cbba13b2cf | |
| parent | 67e2bc037137e4fdcf6b3132a4f54c165726500b (diff) | |
frr: use elfutils instead of abandoned libelf
| -rw-r--r-- | pkgs/servers/frr/clippy-helper.nix | 5 | ||||
| -rw-r--r-- | pkgs/servers/frr/default.nix | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/servers/frr/clippy-helper.nix b/pkgs/servers/frr/clippy-helper.nix index bb5887bda0f3a..c2b4b918ceca5 100644 --- a/pkgs/servers/frr/clippy-helper.nix +++ b/pkgs/servers/frr/clippy-helper.nix @@ -8,7 +8,7 @@ , flex , bison , pkg-config -, libelf +, elfutils , perl , python3 @@ -29,8 +29,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - libelf python3 + ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ + elfutils ]; configureFlags = [ diff --git a/pkgs/servers/frr/default.nix b/pkgs/servers/frr/default.nix index d588fee004838..d4adb5ed34faa 100644 --- a/pkgs/servers/frr/default.nix +++ b/pkgs/servers/frr/default.nix @@ -16,7 +16,7 @@ , c-ares , json_c , libcap -, libelf +, elfutils , libunwind , libyang , net-snmp @@ -118,7 +118,6 @@ stdenv.mkDerivation rec { buildInputs = [ c-ares json_c - libelf libunwind libyang openssl @@ -132,6 +131,8 @@ stdenv.mkDerivation rec { libcap ] ++ lib.optionals snmpSupport [ net-snmp + ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ + elfutils ]; # otherwise in cross-compilation: "configure: error: no working python version found" |