diff --git a/pkgs/os-specific/linux/kernel/grsecurity-modinst.patch b/pkgs/os-specific/linux/kernel/grsecurity-modinst.patch deleted file mode 100644 index 275d96fbb29..00000000000 --- a/pkgs/os-specific/linux/kernel/grsecurity-modinst.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN a/scripts/Makefile.modinst b/scripts/Makefile.modinst ---- a/scripts/Makefile.modinst 2016-11-15 07:49:06.000000000 +0100 -+++ b/scripts/Makefile.modinst 2016-11-18 13:45:07.977270500 +0100 -@@ -9,7 +9,7 @@ - - # - --__modules := $(sort $(shell grep -h '\.ko$$' /dev/null $(wildcard $(MODVERDIR)/*.mod))) -+__modules := $(shell find $(MODVERDIR) -name '*.mod' -exec grep -h '\.ko$$' '{}' \; | sort) - modules := $(patsubst %.o,%.ko,$(wildcard $(__modules:.ko=.o))) - - PHONY += $(modules) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 999b9dc260a..fc9ef4ac53e 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -99,14 +99,6 @@ rec { patch = ./grsecurity-nixos-kmod.patch; }; - # A temporary work-around for execvp: arglist too long error during - # module_install. Without this, no modules are installed into the - # resulting output. - grsecurity_modinst = - { name = "grsecurity-modinst"; - patch = ./grsecurity-modinst.patch; - }; - crc_regression = { name = "crc-backport-regression"; patch = ./crc-regression.patch; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69abb1d39b2..6f7808b9b2a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11207,7 +11207,7 @@ in ]; }; grsecPatch = self.kernelPatches.grsecurity_testing; - kernelPatches = with self.kernelPatches; [ grsecurity_nixos_kmod grsecurity_modinst ]; + kernelPatches = [ self.kernelPatches.grsecurity_nixos_kmod ]; extraConfig = callPackage ../os-specific/linux/kernel/grsecurity-nixos-config.nix { }; };