diff options
| author | Atemu <atemu.main@gmail.com> | 2023-03-03 19:41:10 +0100 |
|---|---|---|
| committer | Fabián Heredia Montiel <fabianhjr@protonmail.com> | 2023-03-13 16:42:22 -0600 |
| commit | 9bd2506458ea053ccbcde6e622d7cec9993d8f36 (patch) | |
| tree | 7008491e4fcfb755a2cd2dc49465c94cd5a4c282 /pkgs/development/libraries/xine-lib/default.nix | |
| parent | 711e9cfd493296681b84147a650972ea78e948c4 (diff) | |
treewide: make ffmpeg_4-dependant packages depend on ffmpeg_4
These packages were identified as broken when ffmpeg = ffmpeg_5. Tested _only_ by building them. If you are a maintainer of one of these packages, please test whether your package still works.
Diffstat (limited to 'pkgs/development/libraries/xine-lib/default.nix')
| -rw-r--r-- | pkgs/development/libraries/xine-lib/default.nix | 10 |
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 |