diff options
| author | misuzu <bakalolka@gmail.com> | 2020-03-15 17:03:26 +0200 |
|---|---|---|
| committer | misuzu <bakalolka@gmail.com> | 2021-09-28 10:47:49 +0300 |
| commit | 595b328a1772936bf701c642f09631ad0fcb1907 (patch) | |
| tree | b2444980108077e1a54941e4968974b80b0dcf39 /pkgs/tools/admin/lxd | |
| parent | 80d76320cad648d3ffa93ebcc7a5b02c01733bb8 (diff) | |
lxd: use ebtables from iptables package
Diffstat (limited to 'pkgs/tools/admin/lxd')
| -rw-r--r-- | pkgs/tools/admin/lxd/default.nix | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 523f8165802e3..ecdcefdd773f7 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -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' "$@" |