From e1789e9066dfba2d99e686e854949a0c612d357d Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Wed, 16 Oct 2024 09:06:29 +0200
Subject: [PATCH] clean up apparmor.d submodules

---
 common/tooling/apparmor/apparmor-d-package.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/common/tooling/apparmor/apparmor-d-package.nix b/common/tooling/apparmor/apparmor-d-package.nix
index 41ae8e7..111eda5 100644
--- a/common/tooling/apparmor/apparmor-d-package.nix
+++ b/common/tooling/apparmor/apparmor-d-package.nix
@@ -21,15 +21,18 @@ buildGoModule {
     ./apparmor-d-paths.patch
   ];
 
+  subPackages = [
+    "cmd/prebuild"
+    "cmd/aa-log"
+  ];
+
   postInstall = ''
-    mkdir -p $out/etc build/apparmor.d
+    mkdir -p $out/etc
     
-    rm $out/bin/cmd $out/bin/aa
-    mv $out/bin/prebuild build/prebuild
-    
-    DISTRIBUTION=arch ./build/prebuild --complain --abi 4 # fixme: replace with nixos support once available
+    DISTRIBUTION=arch $out/bin/prebuild --complain --abi 4 # fixme: replace with nixos support once available
     
     mv .build/apparmor.d $out/etc
+    rm $out/bin/prebuild
   '';
 
   meta = {