lxd: use ebtables from iptables package
This commit is contained in:
parent
80d76320ca
commit
595b328a17
1 changed files with 2 additions and 10 deletions
|
@ -1,22 +1,14 @@
|
|||
{ lib, hwdata, pkg-config, lxc, buildGoPackage, fetchurl
|
||||
, makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq, attr
|
||||
, squashfsTools, iproute2, iptables, ebtables, iptables-nftables-compat, libcap
|
||||
, squashfsTools, iproute2, iptables, libcap
|
||||
, dqlite, raft-canonical, sqlite-replication, udev
|
||||
, writeShellScriptBin, apparmor-profiles, apparmor-parser
|
||||
, criu
|
||||
, bash
|
||||
, installShellFiles
|
||||
, nftablesSupport ? false
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
let
|
||||
networkPkgs = if nftablesSupport then
|
||||
[ iptables-nftables-compat ]
|
||||
else
|
||||
[ iptables ebtables ];
|
||||
|
||||
in
|
||||
buildGoPackage rec {
|
||||
pname = "lxd";
|
||||
version = "4.18";
|
||||
|
@ -45,7 +37,7 @@ buildGoPackage rec {
|
|||
rm $out/bin/{deps,macaroon-identity,generate}
|
||||
|
||||
wrapProgram $out/bin/lxd --prefix PATH : ${lib.makeBinPath (
|
||||
networkPkgs
|
||||
[ iptables ]
|
||||
++ [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute2 bash criu attr ]
|
||||
++ [ (writeShellScriptBin "apparmor_parser" ''
|
||||
exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@"
|
||||
|
|
Loading…
Reference in a new issue