From 6f8b1aec39d03b11471e775391a1110c08109e5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 18 Jul 2020 17:50:42 +0200
Subject: [PATCH] Revert "apparmor: only apply the gnumake fix to the parser"

This reverts commit 4b028aecae881fbfbe51, as planned.
---
 pkgs/os-specific/linux/apparmor/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix
index 66c2582603c1..807ab4fa44be 100644
--- a/pkgs/os-specific/linux/apparmor/default.nix
+++ b/pkgs/os-specific/linux/apparmor/default.nix
@@ -39,6 +39,9 @@ let
   };
 
   prePatchCommon = ''
+    patch -p1 < ${gnumake43Patch}
+    chmod a+x ./common/list_capabilities.sh ./common/list_af_names.sh
+    patchShebangs ./common/list_capabilities.sh ./common/list_af_names.sh
     substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${buildPackages.perl}/bin/pod2man"
     substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2html" "${buildPackages.perl}/bin/pod2html"
     substituteInPlace ./common/Make.rules --replace "/usr/include/linux/capability.h" "${linuxHeaders}/include/linux/capability.h"
@@ -184,11 +187,7 @@ let
 
     buildInputs = [ libapparmor ];
 
-    prePatch = ''
-      patch -p1 < ${gnumake43Patch}
-      chmod a+x ./common/list_capabilities.sh ./common/list_af_names.sh
-      patchShebangs ./common/list_capabilities.sh ./common/list_af_names.sh
-    '' + prePatchCommon + ''
+    prePatch = prePatchCommon + ''
       substituteInPlace ./parser/Makefile --replace "/usr/bin/bison" "${bison}/bin/bison"
       substituteInPlace ./parser/Makefile --replace "/usr/bin/flex" "${flex}/bin/flex"
       substituteInPlace ./parser/Makefile --replace "/usr/include/linux/capability.h" "${linuxHeaders}/include/linux/capability.h"