diff options
author | Florian Klink <flokli@flokli.de> | 2021-10-12 12:38:56 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-12 12:38:56 +0200 |
commit | b112f366fb6853ca8582cdef2def20acc4717af5 (patch) | |
tree | 1e7819f1e919b3327dda117815893d50e4c08250 /pkgs/tools/admin/lxd | |
parent | 234f96b4d31d24ecf675cc2f9bcbc5554c9f71f2 (diff) | |
parent | f898fde5860cf7b61519fbde0c8152ea888ed491 (diff) |
Merge pull request #81172 from misuzu/iptables-switch
iptables: switch from iptables-legacy to iptables-nftables-compat
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 12ea0f7a55d06..ec6b867f9f7c1 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.19"; @@ -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' "$@" |