diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-12-29 21:29:34 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-12-29 21:29:34 +0000 |
| commit | 1acfa8ff79fd8895ebc7ca9954830ace0577fff2 (patch) | |
| tree | 25f168400b9192ca94a7bdb0bb19ce11f03db509 /pkgs/os-specific/linux/digimend/default.nix | |
| parent | 82bd3b0cbfb0af1555ed5b6b6f4edf2b6b17a144 (diff) | |
| parent | be90b35b9efbd7baaa80f367ffc41609531a8fe2 (diff) | |
| download | nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar.gz nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar.bz2 nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar.lz nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar.xz nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar.zst nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.zip | |
Merge remote-tracking branch 'nixpkgs/master' into spectrum
Diffstat (limited to 'pkgs/os-specific/linux/digimend/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/digimend/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/digimend/default.nix b/pkgs/os-specific/linux/digimend/default.nix index 40f801881fc..94f32d2c432 100644 --- a/pkgs/os-specific/linux/digimend/default.nix +++ b/pkgs/os-specific/linux/digimend/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, kernel }: +{ stdenv, fetchFromGitHub, fetchpatch, kernel }: assert stdenv.lib.versionAtLeast kernel.version "3.5"; @@ -20,6 +20,15 @@ stdenv.mkDerivation rec { sed 's/depmod /true /' -i Makefile ''; + patches = [ + # Fix build on Linux kernel >= 5.4 + # https://github.com/DIGImend/digimend-kernel-drivers/pull/331 + (fetchpatch { + url = "https://github.com/DIGImend/digimend-kernel-drivers/commit/fb8a2eb6a9198bb35aaccb81e22dd5ebe36124d1.patch"; + sha256 = "1j7l5hsk59gccydpf7n6xx1ki4rm6aka7k879a7ah5jn8p1ylgw9"; + }) + ]; + nativeBuildInputs = kernel.moduleBuildDependencies; postInstall = '' |