summary refs log tree commit diff
path: root/pkgs/os-specific/linux/apparmor
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2018-11-28 00:52:18 -0600
committerWill Dietz <w@wdtz.org>2018-11-29 08:48:27 -0600
commite82d79b6794790e925407c658c947ba1eafb828b (patch)
treef0dd2b8805fcb8787870db5a12695bbbd4e38ff3 /pkgs/os-specific/linux/apparmor
parent014f1c9d7f81e0d8a7ab7e7ff6d34d00213db91b (diff)
downloadnixpkgs-e82d79b6794790e925407c658c947ba1eafb828b.tar
nixpkgs-e82d79b6794790e925407c658c947ba1eafb828b.tar.gz
nixpkgs-e82d79b6794790e925407c658c947ba1eafb828b.tar.bz2
nixpkgs-e82d79b6794790e925407c658c947ba1eafb828b.tar.lz
nixpkgs-e82d79b6794790e925407c658c947ba1eafb828b.tar.xz
nixpkgs-e82d79b6794790e925407c658c947ba1eafb828b.tar.zst
nixpkgs-e82d79b6794790e925407c658c947ba1eafb828b.zip
libapparmor: drop conflicting patch, fix build w/musl
Diffstat (limited to 'pkgs/os-specific/linux/apparmor')
-rw-r--r--pkgs/os-specific/linux/apparmor/default.nix5
1 files changed, 0 insertions, 5 deletions
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
@@ -38,11 +38,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";
       sha256 = "0yyaqz8jlmn1bm37arggprqz0njb4lhjni2d9c8qfqj0kll0bam0";