From f8cc30d10268a2bda0dbdbb1d9ad95b2860fbecb Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 15 Sep 2024 10:28:31 +0200 Subject: [PATCH] libapparmor: backport patch for musl 1.2.5 --- pkgs/os-specific/linux/apparmor/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index eb2c6ba5d882..b47dbec76164 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -59,6 +59,12 @@ let patches = [ ./0001-aa-remove-unknown_empty-ruleset.patch + + (fetchpatch { + name = "basename.patch"; + url = "https://gitlab.com/apparmor/apparmor/-/commit/7fb040bde69ebdfce48cf1a01c1a62fd4f8eef0a.patch"; + hash = "sha256-RZ04nfcV8hTd2CO3mYcfOGCLke8+FhV7DPfmDqSSdWk="; + }) ] ++ lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { url = "https://git.alpinelinux.org/aports/plain/testing/apparmor/0003-Added-missing-typedef-definitions-on-parser.patch?id=74b8427cc21f04e32030d047ae92caa618105b53";