diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-07-18 17:46:37 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-07-18 17:46:37 +0200 |
| commit | 4b028aecae881fbfbe51d1072489af41578c6f49 (patch) | |
| tree | f22b2ea0863839a39dbacaf44c0c121581c65ecc /pkgs/os-specific/linux/apparmor/default.nix | |
| parent | 8da4505aa62d1613acd4b87db5f5996a4807151e (diff) | |
| download | nixpkgs-4b028aecae881fbfbe51d1072489af41578c6f49.tar nixpkgs-4b028aecae881fbfbe51d1072489af41578c6f49.tar.gz nixpkgs-4b028aecae881fbfbe51d1072489af41578c6f49.tar.bz2 nixpkgs-4b028aecae881fbfbe51d1072489af41578c6f49.tar.lz nixpkgs-4b028aecae881fbfbe51d1072489af41578c6f49.tar.xz nixpkgs-4b028aecae881fbfbe51d1072489af41578c6f49.tar.zst nixpkgs-4b028aecae881fbfbe51d1072489af41578c6f49.zip | |
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.
Diffstat (limited to 'pkgs/os-specific/linux/apparmor/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/apparmor/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 807ab4fa44b..66c2582603c 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -39,9 +39,6 @@ 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" @@ -187,7 +184,11 @@ let buildInputs = [ libapparmor ]; - prePatch = prePatchCommon + '' + 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 + '' 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" |