From 76a936228ac9ac60d727c80c90079eacc04f6124 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 16 Jun 2022 10:25:24 -0400 Subject: linuxPackages.system76-io: Fix building on newer kernels. See https://github.com/pop-os/system76-io-dkms/issues/7 --- pkgs/os-specific/linux/system76-io/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'pkgs/os-specific/linux/system76-io/default.nix') diff --git a/pkgs/os-specific/linux/system76-io/default.nix b/pkgs/os-specific/linux/system76-io/default.nix index fb697430f61..ab8c422d2da 100644 --- a/pkgs/os-specific/linux/system76-io/default.nix +++ b/pkgs/os-specific/linux/system76-io/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, kernel }: +{ lib, stdenv, fetchFromGitHub, kernel, fetchpatch }: let version = "1.0.1"; sha256 = "0qkgkkjy1isv6ws6hrcal75dxjz98rpnvqbm7agdcc6yv0c17wwh"; @@ -15,6 +15,19 @@ stdenv.mkDerivation { inherit sha256; }; + patches = [ + (fetchpatch { + name = "Fix_GCC_declaration-after-statement_error.patch"; + url = "https://patch-diff.githubusercontent.com/raw/pop-os/system76-io-dkms/pull/5.patch"; + sha256 = "sha256-G8SM5tdNbeLuwigmo1HKLN9o16WPpowLXxfM7Xi4aRI="; + }) + (fetchpatch { + name = "Fix_GCC_unused-function_error.patch"; + url = "https://patch-diff.githubusercontent.com/raw/pop-os/system76-io-dkms/pull/6.patch"; + sha256 = "sha256-vCXEzszmXa+wmI84oR8WduN4WnLTZA3M4GX+Jc4p/5o="; + }) + ]; + hardeningDisable = [ "pic" ]; nativeBuildInputs = kernel.moduleBuildDependencies; -- cgit 1.4.1