mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-19 07:01:12 +00:00
[Backport release-26.05] frr: fix cross build with lua scripting (#537136)
This commit is contained in:
@@ -46,6 +46,7 @@
|
||||
cumulusSupport ? false,
|
||||
irdpSupport ? true,
|
||||
mgmtdSupport ? true,
|
||||
scriptingSupport ? true,
|
||||
# Experimental as of 10.1, reconsider if upstream changes defaults
|
||||
grpcSupport ? false,
|
||||
|
||||
@@ -120,7 +121,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
python3
|
||||
readline
|
||||
rtrlib
|
||||
lua53Packages.lua
|
||||
sqlite
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
@@ -135,11 +135,17 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optionals grpcSupport [
|
||||
grpc
|
||||
protobuf
|
||||
]
|
||||
++ lib.optionals scriptingSupport [
|
||||
lua53Packages.lua
|
||||
];
|
||||
|
||||
# otherwise in cross-compilation: "configure: error: no working python version found"
|
||||
depsBuildBuild = [
|
||||
buildPackages.python3
|
||||
]
|
||||
++ lib.optionals scriptingSupport [
|
||||
buildPackages.lua53Packages.lua
|
||||
];
|
||||
|
||||
# cross-compiling: clippy is compiled with the build host toolchain, split it out to ease
|
||||
@@ -157,7 +163,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"--enable-logfile-mask=0640"
|
||||
"--enable-multipath=${toString numMultipath}"
|
||||
"--enable-config-rollbacks"
|
||||
"--enable-scripting"
|
||||
"--enable-user=frr"
|
||||
"--enable-vty-group=frrvty"
|
||||
"--localstatedir=/var"
|
||||
@@ -171,6 +176,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.strings.enableFeature irdpSupport "irdp")
|
||||
(lib.strings.enableFeature mgmtdSupport "mgmtd")
|
||||
(lib.strings.enableFeature grpcSupport "grpc")
|
||||
(lib.strings.enableFeature scriptingSupport "scripting")
|
||||
|
||||
# routing protocols
|
||||
(lib.strings.enableFeature bgpdSupport "bgpd")
|
||||
|
||||
Reference in New Issue
Block a user