From a3b4c88a030d61190b481339e6f9a2849cd4cae1 Mon Sep 17 00:00:00 2001 From: ssoss Date: Wed, 10 Sep 2025 17:00:43 -0500 Subject: [PATCH] apparmor-parser: use full path for aa-status Replaces the dynamic lookup of the aa-status path with the full Nix derivation path. This change also fixes issues with the use of which causing POSIX shell incompatibilities. --- pkgs/by-name/ap/apparmor-parser/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ap/apparmor-parser/package.nix b/pkgs/by-name/ap/apparmor-parser/package.nix index aa21b93bf592..2e00c9c5eb4e 100644 --- a/pkgs/by-name/ap/apparmor-parser/package.nix +++ b/pkgs/by-name/ap/apparmor-parser/package.nix @@ -9,6 +9,7 @@ # apparmor deps libapparmor, + apparmor-bin-utils, # testing perl, @@ -28,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace rc.apparmor.functions \ --replace-fail "/sbin/apparmor_parser" "$out/bin/apparmor_parser" # FIXME substituteInPlace rc.apparmor.functions \ - --replace-fail "/usr/sbin/aa-status" '$(which aa-status)' + --replace-fail "/usr/sbin/aa-status" "${lib.getExe' apparmor-bin-utils "aa-status"}" sed -i rc.apparmor.functions -e '2i . ${./fix-rc.apparmor.functions.sh}' '';