summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2020-04-19 16:25:48 +0200
committerPeter Simons <simons@cryp.to>2020-04-19 16:25:48 +0200
commit00222dbb0efd3234b471207aa329025cf38d7d8b (patch)
tree9ab3cfbb6370b81304cb4423f319bbb47b80b076 /pkgs/os-specific
parent0e4417f1185e2093eb4f084e144f49a66f701db9 (diff)
downloadnixpkgs-00222dbb0efd3234b471207aa329025cf38d7d8b.tar
nixpkgs-00222dbb0efd3234b471207aa329025cf38d7d8b.tar.gz
nixpkgs-00222dbb0efd3234b471207aa329025cf38d7d8b.tar.bz2
nixpkgs-00222dbb0efd3234b471207aa329025cf38d7d8b.tar.lz
nixpkgs-00222dbb0efd3234b471207aa329025cf38d7d8b.tar.xz
nixpkgs-00222dbb0efd3234b471207aa329025cf38d7d8b.tar.zst
nixpkgs-00222dbb0efd3234b471207aa329025cf38d7d8b.zip
bbswitch: fix build with Linux kernel version >= 5.6.0
Fixes https://github.com/NixOS/nixpkgs/issues/85564.
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/bbswitch/default.nix14
1 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix
index eea8d31f24d..67cbc6e5c5e 100644
--- a/pkgs/os-specific/linux/bbswitch/default.nix
+++ b/pkgs/os-specific/linux/bbswitch/default.nix
@@ -15,10 +15,16 @@ stdenv.mkDerivation {
     sha256 = "0xql1nv8dafnrcg54f3jsi3ny3cd2ca9iv73pxpgxd2gfczvvjkn";
   };
 
-  patches = [ (fetchpatch {
-    url = "https://github.com/Bumblebee-Project/bbswitch/pull/102.patch";
-    sha256 = "1lbr6pyyby4k9rn2ry5qc38kc738d0442jhhq57vmdjb6hxjya7m";
-  }) ];
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/Bumblebee-Project/bbswitch/pull/102.patch";
+      sha256 = "1lbr6pyyby4k9rn2ry5qc38kc738d0442jhhq57vmdjb6hxjya7m";
+    })
+    (fetchpatch {
+      url = "https://github.com/Bumblebee-Project/bbswitch/pull/196.patch";
+      sha256 = "02ihy3piws7783qbm9q0mb9s18ipn5ckdy1iar74xn31qjrsn99n";
+    })
+  ];
 
   nativeBuildInputs = kernel.moduleBuildDependencies;