summary refs log tree commit diff
path: root/pkgs/tools/admin
diff options
context:
space:
mode:
authorJoachim F <joachifm@users.noreply.github.com>2018-11-24 14:48:38 +0000
committerGitHub <noreply@github.com>2018-11-24 14:48:38 +0000
commitf00bc13ad7c3a322bc340a1babdfdd9a44adde83 (patch)
tree35c8eebfe2cb8d924c020f6761d49eabe56c6e1c /pkgs/tools/admin
parent984285355a57145561a5a1cb049b3a3170f87532 (diff)
parent291499d10ea380a6029e56f8492a1b5df3ee515b (diff)
downloadnixpkgs-f00bc13ad7c3a322bc340a1babdfdd9a44adde83.tar
nixpkgs-f00bc13ad7c3a322bc340a1babdfdd9a44adde83.tar.gz
nixpkgs-f00bc13ad7c3a322bc340a1babdfdd9a44adde83.tar.bz2
nixpkgs-f00bc13ad7c3a322bc340a1babdfdd9a44adde83.tar.lz
nixpkgs-f00bc13ad7c3a322bc340a1babdfdd9a44adde83.tar.xz
nixpkgs-f00bc13ad7c3a322bc340a1babdfdd9a44adde83.tar.zst
nixpkgs-f00bc13ad7c3a322bc340a1babdfdd9a44adde83.zip
Merge pull request #50831 from andersk/lxd-apparmor_parser
lxd: Provide apparmor_parser
Diffstat (limited to 'pkgs/tools/admin')
-rw-r--r--pkgs/tools/admin/lxd/default.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix
index 09c29517af4..9eb249bc587 100644
--- a/pkgs/tools/admin/lxd/default.nix
+++ b/pkgs/tools/admin/lxd/default.nix
@@ -2,6 +2,7 @@
 , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq
 , squashfsTools, iproute, iptables, ebtables, libcap, dqlite
 , sqlite-replication
+, writeShellScriptBin, apparmor-profiles, apparmor-parser
 }:
 
 buildGoPackage rec {
@@ -31,6 +32,9 @@ buildGoPackage rec {
 
     wrapProgram $bin/bin/lxd --prefix PATH ":" ${stdenv.lib.makeBinPath [
       acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ebtables
+      (writeShellScriptBin "apparmor_parser" ''
+        exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@"
+      '')
     ]}
   '';