summary refs log tree commit diff
path: root/pkgs/os-specific/linux/dddvb/default.nix
diff options
context:
space:
mode:
authorMartin Weinelt <hexa@darmstadt.ccc.de>2022-08-05 12:00:57 +0200
committerMartin Weinelt <hexa@darmstadt.ccc.de>2022-08-05 12:08:07 +0200
commit9c48ac1b36fd8294657c4a67d71a8fcc2838aeb6 (patch)
tree77adabae5ec3cef681de135bcb433b8b2b4d15eb /pkgs/os-specific/linux/dddvb/default.nix
parent2c729e5a8f7dc371c006b7ae93aafb7c1af9c5dc (diff)
downloadnixpkgs-9c48ac1b36fd8294657c4a67d71a8fcc2838aeb6.tar
nixpkgs-9c48ac1b36fd8294657c4a67d71a8fcc2838aeb6.tar.gz
nixpkgs-9c48ac1b36fd8294657c4a67d71a8fcc2838aeb6.tar.bz2
nixpkgs-9c48ac1b36fd8294657c4a67d71a8fcc2838aeb6.tar.lz
nixpkgs-9c48ac1b36fd8294657c4a67d71a8fcc2838aeb6.tar.xz
nixpkgs-9c48ac1b36fd8294657c4a67d71a8fcc2838aeb6.tar.zst
nixpkgs-9c48ac1b36fd8294657c4a67d71a8fcc2838aeb6.zip
linuxPackages.dddvb: 0.9.38-pre.4 -> 0.9.38-pre.6
Apply patch to unbreak on 5.18+.
Diffstat (limited to 'pkgs/os-specific/linux/dddvb/default.nix')
-rw-r--r--pkgs/os-specific/linux/dddvb/default.nix16
1 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/dddvb/default.nix b/pkgs/os-specific/linux/dddvb/default.nix
index a6994722756..ea69ecd7513 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";
   };
 }