summary refs log tree commit diff
diff options
context:
space:
mode:
authorLassulus <github@lassul.us>2020-09-25 15:00:50 +0200
committerGitHub <noreply@github.com>2020-09-25 15:00:50 +0200
commit0fd8186e29fd25ef5205a86c7e947c1bd8f1c727 (patch)
tree16a06b1005b0235e1ce7d4b31f2b9894eee4b4bf
parent1d916fab56fa96bd8c8b3d2fdeef9130590dac0f (diff)
parente8d1a486fb95435fb0274e89582bbca374f5ecea (diff)
downloadnixpkgs-0fd8186e29fd25ef5205a86c7e947c1bd8f1c727.tar
nixpkgs-0fd8186e29fd25ef5205a86c7e947c1bd8f1c727.tar.gz
nixpkgs-0fd8186e29fd25ef5205a86c7e947c1bd8f1c727.tar.bz2
nixpkgs-0fd8186e29fd25ef5205a86c7e947c1bd8f1c727.tar.lz
nixpkgs-0fd8186e29fd25ef5205a86c7e947c1bd8f1c727.tar.xz
nixpkgs-0fd8186e29fd25ef5205a86c7e947c1bd8f1c727.tar.zst
nixpkgs-0fd8186e29fd25ef5205a86c7e947c1bd8f1c727.zip
Merge pull request #97776 from woffs/dvdbackup
dvdbackup: fix build with libdvdread >= 6.1.0
-rw-r--r--pkgs/applications/video/dvdbackup/default.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/applications/video/dvdbackup/default.nix b/pkgs/applications/video/dvdbackup/default.nix
index e129031fd49..633eea3d282 100644
--- a/pkgs/applications/video/dvdbackup/default.nix
+++ b/pkgs/applications/video/dvdbackup/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libdvdread, libdvdcss, dvdauthor }:
+{ stdenv, fetchurl, fetchpatch, libdvdread, libdvdcss, dvdauthor }:
 
 stdenv.mkDerivation rec {
   version = "0.4.2";
@@ -11,6 +11,13 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libdvdread libdvdcss dvdauthor ];
 
+  # see https://bugs.launchpad.net/dvdbackup/+bug/1869226
+  patchFlags = [ "-p0" ];
+  patches = [ (fetchpatch {
+    url = "https://git.slackbuilds.org/slackbuilds/plain/multimedia/dvdbackup/patches/dvdbackup-dvdread-6.1.patch";
+    sha256 = "1v3xl01bwq1592i5x5dyh95r0mmm1zvvwf92fgjc0smr0k3davfz";
+  })];
+
   meta = {
     description = "A tool to rip video DVDs from the command line";
     homepage = "http://dvdbackup.sourceforge.net/";