diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-02-06 14:24:46 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-06 14:24:46 +0100 |
| commit | ff101946a846bff067ee3d1f4c18fa2c8a9e7f79 (patch) | |
| tree | 01fffd5f6fa291f1d80b6ca024d5c62a2b96653e /pkgs/tools/admin | |
| parent | 72f8f89849ebe341c697486f63df7fbac35f6b5c (diff) | |
| parent | dbc771f2e107fa364493c968796a8772d569e4a8 (diff) | |
| download | nixlib-ff101946a846bff067ee3d1f4c18fa2c8a9e7f79.tar nixlib-ff101946a846bff067ee3d1f4c18fa2c8a9e7f79.tar.gz nixlib-ff101946a846bff067ee3d1f4c18fa2c8a9e7f79.tar.bz2 nixlib-ff101946a846bff067ee3d1f4c18fa2c8a9e7f79.tar.lz nixlib-ff101946a846bff067ee3d1f4c18fa2c8a9e7f79.tar.xz nixlib-ff101946a846bff067ee3d1f4c18fa2c8a9e7f79.tar.zst nixlib-ff101946a846bff067ee3d1f4c18fa2c8a9e7f79.zip | |
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1503899
Diffstat (limited to 'pkgs/tools/admin')
| -rw-r--r-- | pkgs/tools/admin/lxd/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 9eb249bc5879..e48b525caba6 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -3,6 +3,7 @@ , squashfsTools, iproute, iptables, ebtables, libcap, dqlite , sqlite-replication , writeShellScriptBin, apparmor-profiles, apparmor-parser +, bash }: buildGoPackage rec { @@ -30,8 +31,8 @@ buildGoPackage rec { # binaries from test/ rm $bin/bin/{deps,macaroon-identity} - wrapProgram $bin/bin/lxd --prefix PATH ":" ${stdenv.lib.makeBinPath [ - acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ebtables + wrapProgram $bin/bin/lxd --prefix PATH : ${stdenv.lib.makeBinPath [ + acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ebtables bash (writeShellScriptBin "apparmor_parser" '' exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@" '') |