about summary refs log tree commit diff
path: root/pkgs/development/libraries/xine-lib/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/libraries/xine-lib/default.nix')
-rw-r--r--pkgs/development/libraries/xine-lib/default.nix10
1 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix
index 263b6cd595907..837cc0d48b57e 100644
--- a/pkgs/development/libraries/xine-lib/default.nix
+++ b/pkgs/development/libraries/xine-lib/default.nix
@@ -5,7 +5,7 @@
 , aalib
 , alsa-lib
 , autoconf
-, ffmpeg
+, ffmpeg_4
 , flac
 , libGL
 , libGLU
@@ -42,12 +42,6 @@ stdenv.mkDerivation rec {
       url = "https://raw.githubusercontent.com/archlinux/svntogit-community/209ae10d59d29c13633b75aa327cf937f3ff0725/trunk/010-xine-lib-libcaca-0.99.beta20-fix.patch";
       sha256 = "088141x1yp84y09x3s01v21yzas2bwavxz9v30z5hyq6c3syrmgr";
     })
-    # Fix build with ffmpeg 5.0 ; remove for xine-lib 1.2.12
-    (fetchpatch {
-      name = "xine-lib-ffmpeg-5.0-fix.patch";
-      url = "https://raw.githubusercontent.com/archlinux/svntogit-community/209ae10d59d29c13633b75aa327cf937f3ff0725/trunk/020-xine-lib-ffmpeg-5.0-fix.patch";
-      sha256 = "15ff15bqxq1nqqazfbmfq6swrdjr2raxyq7hx6k0r61izhf0g8ld";
-    })
   ];
 
   nativeBuildInputs = [
@@ -58,7 +52,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     aalib
     alsa-lib
-    ffmpeg
+    ffmpeg_4 # xine-lib 1.2.12 should support ffmpeg_5
     flac
     libGL
     libGLU