Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 72677fa73503
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 76c0ebc710de
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Feb 4, 2019

  1. lxd: fix sh not in path (#55073)

    lxd: add bash to PATH
    megheaiulian authored and markuskowa committed Feb 4, 2019
    Copy the full SHA
    76c0ebc View commit details
Showing with 3 additions and 2 deletions.
  1. +3 −2 pkgs/tools/admin/lxd/default.nix
5 changes: 3 additions & 2 deletions pkgs/tools/admin/lxd/default.nix
Original file line number Diff line number Diff line change
@@ -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' "$@"
'')