diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2020-06-11 10:49:40 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-11 10:49:40 -0500 |
commit | 656783a3d1864fc94ed4183c267f641e644640d0 (patch) | |
tree | b097fa2f314b9fa498170661b524ac0efc821d78 /pkgs/tools | |
parent | 2c7ec299fa29903cf0c93cb1d090dc2c85011c47 (diff) | |
parent | 8ae7ac9e8c959cf0524331550f858549edd5152e (diff) | |
download | nixpkgs-656783a3d1864fc94ed4183c267f641e644640d0.tar nixpkgs-656783a3d1864fc94ed4183c267f641e644640d0.tar.gz nixpkgs-656783a3d1864fc94ed4183c267f641e644640d0.tar.bz2 nixpkgs-656783a3d1864fc94ed4183c267f641e644640d0.tar.lz nixpkgs-656783a3d1864fc94ed4183c267f641e644640d0.tar.xz nixpkgs-656783a3d1864fc94ed4183c267f641e644640d0.tar.zst nixpkgs-656783a3d1864fc94ed4183c267f641e644640d0.zip |
Merge pull request #89540 from Patryk27/fixes/lxd-lxcfs
Fix `lxd`, so that it works with `lxcfs`
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/admin/lxd/default.nix | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 43cd243561b..562149414b3 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -1,13 +1,21 @@ { stdenv, hwdata, pkgconfig, lxc, buildGoPackage, fetchurl , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq -, squashfsTools, iproute, iptables, ebtables, libcap, libco-canonical, dqlite -, raft-canonical, sqlite-replication, udev +, squashfsTools, iproute, iptables, ebtables, iptables-nftables-compat, libcap +, libco-canonical, dqlite, raft-canonical, sqlite-replication, udev , writeShellScriptBin, apparmor-profiles, apparmor-parser , criu , bash , installShellFiles +, nftablesSupport ? false }: +let + networkPkgs = if nftablesSupport then + [ iptables-nftables-compat ] + else + [ iptables ebtables ]; + +in buildGoPackage rec { pname = "lxd"; version = "4.2"; @@ -38,12 +46,14 @@ buildGoPackage rec { # test binaries, code generation rm $out/bin/{deps,macaroon-identity,generate} - wrapProgram $out/bin/lxd --prefix PATH : ${stdenv.lib.makeBinPath [ - acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ebtables bash criu - (writeShellScriptBin "apparmor_parser" '' - exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@" - '') - ]} + wrapProgram $out/bin/lxd --prefix PATH : ${stdenv.lib.makeBinPath ( + networkPkgs + ++ [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute bash criu ] + ++ [ (writeShellScriptBin "apparmor_parser" '' + exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@" + '') ] + ) + } installShellCompletion --bash go/src/github.com/lxc/lxd/scripts/bash/lxd-client ''; |