diff options
| author | Gabriel Ebner <gebner@gebner.org> | 2022-05-28 16:32:14 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-05-28 16:08:50 +0000 |
| commit | ff48f1faa1b8919e420108c6194ddd0cb24de763 (patch) | |
| tree | 89a7b2b5f4869921fc53a278d0fded0d35e866d9 | |
| parent | Merge pull request #175054 from NixOS/backport-170545-to-release-22.05 (diff) | |
| download | nixpkgs-origin/backport-175139-to-release-22.05.tar.gz | |
linuxPackages.digimend: unstable-2019-06-18 -> 10origin/backport-175139-to-release-22.05
(cherry picked from commit ddf273588e069b5267d116d8539dab09e8bb55ba)
| -rw-r--r-- | pkgs/os-specific/linux/digimend/default.nix | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/pkgs/os-specific/linux/digimend/default.nix b/pkgs/os-specific/linux/digimend/default.nix index b0ae7cc85088..70fc58232ab4 100644 --- a/pkgs/os-specific/linux/digimend/default.nix +++ b/pkgs/os-specific/linux/digimend/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, kernel }: +{ lib, stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { pname = "digimend"; - version = "unstable-2019-06-18"; + version = "10"; src = fetchFromGitHub { owner = "digimend"; repo = "digimend-kernel-drivers"; - rev = "8b228a755e44106c11f9baaadb30ce668eede5d4"; - sha256 = "1l54j85540386a8aypqka7p5hy1b63cwmpsscv9rmmf10f78v8mm"; + rev = "v${version}"; + sha256 = "0lifd6cx6aa6hcms4zn4hlla3alra08r0svj5x1l8nlsv0ydnl6i"; }; postPatch = '' @@ -16,14 +16,8 @@ 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"; - }) - ]; + # Fix build on Linux kernel >= 5.18 + NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-fallthrough" ]; nativeBuildInputs = kernel.moduleBuildDependencies; |