From 9c48ac1b36fd8294657c4a67d71a8fcc2838aeb6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 Aug 2022 12:00:57 +0200 Subject: [PATCH] linuxPackages.dddvb: 0.9.38-pre.4 -> 0.9.38-pre.6 Apply patch to unbreak on 5.18+. --- pkgs/os-specific/linux/dddvb/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/dddvb/default.nix b/pkgs/os-specific/linux/dddvb/default.nix index a69947227562..ea69ecd7513c 100644 --- a/pkgs/os-specific/linux/dddvb/default.nix +++ b/pkgs/os-specific/linux/dddvb/default.nix @@ -1,20 +1,29 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , kernel }: stdenv.mkDerivation rec { pname = "dddvb"; - version = "0.9.38-pre.4"; + version = "0.9.38-pre.6"; src = fetchFromGitHub { owner = "DigitalDevices"; repo = "dddvb"; - rev = "e9ccab3578965234c0ea38c5b30969f33600561d"; - sha256 = "sha256-gOG+dAeQ++kTC5xaEpsr3emz3s6FXiKeCHmA9shYBJk="; + rev = "refs/tags/${version}"; + hash = "sha256-bt/vMnqRWDDChZ6R4JbCr77cz3nlSPkx6siC9KLSEqs="; }; + patches = [ + (fetchpatch { + # pci_*_dma_mask no longer exists in 5.18 + url = "https://github.com/DigitalDevices/dddvb/commit/871821d6a0be147313bb52570591ce3853b3d370.patch"; + hash = "sha256-wY05HrsduvsIdp/KpS9NWfL3hR9IvGjuNCDljFn7dd0="; + }) + ]; + postPatch = '' sed -i '/depmod/d' Makefile ''; @@ -35,6 +44,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ hexa ]; platforms = platforms.linux; - broken = kernel.kernelAtLeast "5.18"; }; }