git.iko.soy/typeable/nixpkgs
on master help sign in
apparmor: only apply the gnumake fix to the parser

This is to avoid the huge rebuild for now, as it seems to be enough to fix the problem, but I'll revert this on staging anyway.

commit4b028aecae881fbfbe51d1072489af41578c6f49 authorVladimír Čunát <v@cunat.cz> dateSat 18 Jul 2020, 17:46 (6 years ago) parent8da4505
1 file changed+5−4
pkgs/os-specific/linux/apparmor/default.nix+5−4
pkgs/os-specific/linux/apparmor/default.nix+5−4
@@ -39,9 +39,6 @@ let
3939 };
4040
4141 prePatchCommon = ''
42− patch -p1 < ${gnumake43Patch}
43− chmod a+x ./common/list_capabilities.sh ./common/list_af_names.sh
44− patchShebangs ./common/list_capabilities.sh ./common/list_af_names.sh
4542 substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${buildPackages.perl}/bin/pod2man"
4643 substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2html" "${buildPackages.perl}/bin/pod2html"
4744 substituteInPlace ./common/Make.rules --replace "/usr/include/linux/capability.h" "${linuxHeaders}/include/linux/capability.h"
@@ -187,7 +184,11 @@ let
187184
188185 buildInputs = [ libapparmor ];
189186
190− prePatch = prePatchCommon + ''
187+ prePatch = ''
188+ patch -p1 < ${gnumake43Patch}
189+ chmod a+x ./common/list_capabilities.sh ./common/list_af_names.sh
190+ patchShebangs ./common/list_capabilities.sh ./common/list_af_names.sh
191+ '' + prePatchCommon + ''
191192 substituteInPlace ./parser/Makefile --replace "/usr/bin/bison" "${bison}/bin/bison"
192193 substituteInPlace ./parser/Makefile --replace "/usr/bin/flex" "${flex}/bin/flex"
193194 substituteInPlace ./parser/Makefile --replace "/usr/include/linux/capability.h" "${linuxHeaders}/include/linux/capability.h"