From e82d79b6794790e925407c658c947ba1eafb828b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 28 Nov 2018 00:52:18 -0600 Subject: libapparmor: drop conflicting patch, fix build w/musl --- pkgs/os-specific/linux/apparmor/default.nix | 5 ----- 1 file changed, 5 deletions(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index e632be905fd..851520a93be 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -37,11 +37,6 @@ let ''; patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ - (fetchpatch { - url = "https://git.alpinelinux.org/cgit/aports/plain/testing/apparmor/0002-Provide-missing-secure_getenv-and-scandirat-function.patch?id=74b8427cc21f04e32030d047ae92caa618105b53"; - name = "0002-Provide-missing-secure_getenv-and-scandirat-function.patch"; - sha256 = "0pj1bzifghxwxlc39j8hyy17dkjr9fk64kkj94ayymyprz4i4nac"; - }) (fetchpatch { url = "https://git.alpinelinux.org/cgit/aports/plain/testing/apparmor/0003-Added-missing-typedef-definitions-on-parser.patch?id=74b8427cc21f04e32030d047ae92caa618105b53"; name = "0003-Added-missing-typedef-definitions-on-parser.patch"; -- cgit 1.4.1