summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2022-05-23 15:13:48 +0000
committerAlyssa Ross <hi@alyssa.is>2022-05-25 22:21:19 +0000
commitb5633cb915d23b74cc1f8d91530db9f984324410 (patch)
treed2bb2a7b27b2365c95e6a132add55568e11a5b72
parentlinuxPackages.netatop: fix build with Linux 5.18 (diff)
downloadnixpkgs-b5633cb915d23b74cc1f8d91530db9f984324410.tar.gz
linuxPackages.vendor-reset: patch for Linux 5.18
(cherry picked from commit d851e2f78a2c270e0f8ba1954cd884830796c8d0)
-rw-r--r--pkgs/os-specific/linux/vendor-reset/default.nix11
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/vendor-reset/default.nix b/pkgs/os-specific/linux/vendor-reset/default.nix
index 8f1bde7ecbd5..1d5832dba22a 100644
--- a/pkgs/os-specific/linux/vendor-reset/default.nix
+++ b/pkgs/os-specific/linux/vendor-reset/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, kernel, lib }:
+{ stdenv, fetchFromGitHub, fetchpatch, kernel, lib }:
stdenv.mkDerivation rec {
name = "vendor-reset-${version}-${kernel.version}";
@@ -11,6 +11,15 @@ stdenv.mkDerivation rec {
sha256 = "sha256-xa7P7+mRk4FVgi+YYCcsFLfyNqPmXvy3xhGoTDVqPxw=";
};
+ patches = [
+ # Fix build with Linux 5.18.
+ # https://github.com/gnif/vendor-reset/pull/58
+ (fetchpatch {
+ url = "https://github.com/gnif/vendor-reset/commit/5bbffcd6fee5348e8808bdbfcb5b21d455b02f55.patch";
+ sha256 = "sha256-L1QxVpcZAVYiaMFCBfL2EJgeMyOR8sDa1UqF1QB3bns=";
+ })
+ ];
+
nativeBuildInputs = kernel.moduleBuildDependencies;
hardeningDisable = [ "pic" ];