From 76c0ebc710de75ec0aa9687678404a5851b228bf Mon Sep 17 00:00:00 2001 From: Meghea Iulian Date: Mon, 4 Feb 2019 10:19:14 +0200 Subject: [PATCH] lxd: fix sh not in path (#55073) lxd: add bash to PATH --- pkgs/tools/admin/lxd/default.nix | 5 +++-- 1 file 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' "$@" '')