alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

treewide: make ffmpeg_4-dependant packages depend on ffmpeg_4

Browse source 
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.
This commit is contained in:
Atemu 2023-03-03 19:41:10 +01:00 committed by Fabián Heredia Montiel
parent 711e9cfd49
commit 9bd2506458
44 changed files with 91 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/audio/moc/default.nix
View file

@ -15,7 +15,7 @@
, musepackSupport ? true, libmpc, libmpcdec, taglib , musepackSupport ? true, libmpc, libmpcdec, taglib
, vorbisSupport ? true, libvorbis , vorbisSupport ? true, libvorbis
, speexSupport ? true, speex , speexSupport ? true, speex
, ffmpegSupport ? true, ffmpeg , ffmpegSupport ? true, ffmpeg_4
, sndfileSupport ? true, libsndfile , sndfileSupport ? true, libsndfile
, wavpackSupport ? true, wavpack , wavpackSupport ? true, wavpack
# Misc # Misc
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
++ lib.optionals musepackSupport [ libmpc libmpcdec taglib ] ++ lib.optionals musepackSupport [ libmpc libmpcdec taglib ]
++ lib.optional vorbisSupport libvorbis ++ lib.optional vorbisSupport libvorbis
++ lib.optional speexSupport speex ++ lib.optional speexSupport speex
++ lib.optional ffmpegSupport ffmpeg ++ lib.optional ffmpegSupport ffmpeg_4
++ lib.optional sndfileSupport libsndfile ++ lib.optional sndfileSupport libsndfile
++ lib.optional wavpackSupport wavpack ++ lib.optional wavpackSupport wavpack
# Misc # Misc

4
pkgs/applications/audio/musly/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, eigen, ffmpeg }: { lib, stdenv, fetchFromGitHub, cmake, eigen, ffmpeg_4 }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "musly"; pname = "musly";
version = "unstable-2017-04-26"; version = "unstable-2017-04-26";
@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "1q42wvdwy2pac7bhfraqqj2czw7w2m33ms3ifjl8phm7d87i8825"; sha256 = "1q42wvdwy2pac7bhfraqqj2czw7w2m33ms3ifjl8phm7d87i8825";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ eigen ffmpeg ]; buildInputs = [ eigen ffmpeg_4 ];
fixupPhase = lib.optionalString stdenv.isDarwin '' fixupPhase = lib.optionalString stdenv.isDarwin ''
install_name_tool -change libmusly.dylib $out/lib/libmusly.dylib $out/bin/musly install_name_tool -change libmusly.dylib $out/lib/libmusly.dylib $out/bin/musly
install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/bin/musly install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/bin/musly

4
pkgs/applications/audio/spek/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg, wxGTK32, gtk3, wrapGAppsHook }: { lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg_4, wxGTK32, gtk3, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "spek"; pname = "spek";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ]; nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ];
buildInputs = [ ffmpeg wxGTK32 gtk3 ]; buildInputs = [ ffmpeg_4 wxGTK32 gtk3 ];
meta = with lib; { meta = with lib; {
description = "Analyse your audio files by showing their spectrogram"; description = "Analyse your audio files by showing their spectrogram";

4
pkgs/applications/audio/tenacity/default.nix
View file

@ -30,7 +30,7 @@
, expat , expat
, libid3tag , libid3tag
, libopus , libopus
, ffmpeg , ffmpeg_4
, soundtouch , soundtouch
, pcre , pcre
, portaudio , portaudio
@ -110,7 +110,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
alsa-lib alsa-lib
expat expat
ffmpeg ffmpeg_4
file file
flac flac
glib glib

4
pkgs/applications/emulators/attract-mode/default.nix
View file

@ -1,4 +1,4 @@
{ expat, fetchFromGitHub, ffmpeg, fontconfig, freetype, libarchive, libjpeg { expat, fetchFromGitHub, ffmpeg_4, fontconfig, freetype, libarchive, libjpeg
, libGLU, libGL, openal, pkg-config, sfml, lib, stdenv, zlib , libGLU, libGL, openal, pkg-config, sfml, lib, stdenv, zlib
}: }:
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
''; '';
buildInputs = [ buildInputs = [
expat ffmpeg fontconfig freetype libarchive libjpeg libGLU libGL openal sfml zlib expat ffmpeg_4 fontconfig freetype libarchive libjpeg libGLU libGL openal sfml zlib
]; ];
meta = with lib; { meta = with lib; {

4
pkgs/applications/emulators/citra/generic.nix
View file

@ -20,7 +20,7 @@
, enableCubeb ? true, libpulseaudio , enableCubeb ? true, libpulseaudio
, enableFfmpegAudioDecoder ? true , enableFfmpegAudioDecoder ? true
, enableFfmpegVideoDumper ? true , enableFfmpegVideoDumper ? true
, ffmpeg , ffmpeg_4
, useDiscordRichPresence ? true, rapidjson , useDiscordRichPresence ? true, rapidjson
, enableFdk ? false, fdk_aac , enableFdk ? false, fdk_aac
}: }:
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
++ lib.optional enableSdl2 SDL2 ++ lib.optional enableSdl2 SDL2
++ lib.optional enableQtTranslation qttools ++ lib.optional enableQtTranslation qttools
++ lib.optional enableCubeb libpulseaudio ++ lib.optional enableCubeb libpulseaudio
++ lib.optional (enableFfmpegAudioDecoder || enableFfmpegVideoDumper) ffmpeg ++ lib.optional (enableFfmpegAudioDecoder || enableFfmpegVideoDumper) ffmpeg_4
++ lib.optional useDiscordRichPresence rapidjson ++ lib.optional useDiscordRichPresence rapidjson
++ lib.optional enableFdk fdk_aac; ++ lib.optional enableFdk fdk_aac;

4
pkgs/applications/emulators/pcsxr/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, autoreconfHook, intltool, pkg-config, gtk3, SDL2, xorg { lib, stdenv, fetchurl, autoreconfHook, intltool, pkg-config, gtk3, SDL2, xorg
, wrapGAppsHook, libcdio, nasm, ffmpeg, file , wrapGAppsHook, libcdio, nasm, ffmpeg_4, file
, fetchpatch }: , fetchpatch }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ]; nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ];
buildInputs = [ buildInputs = [
gtk3 SDL2 xorg.libXv xorg.libXtst libcdio nasm ffmpeg file gtk3 SDL2 xorg.libXv xorg.libXtst libcdio nasm ffmpeg_4 file
xorg.libXxf86vm xorg.libXxf86vm
]; ];

4
pkgs/applications/emulators/ppsspp/default.nix
View file

@ -4,7 +4,7 @@
, SDL2 , SDL2
, cmake , cmake
, copyDesktopItems , copyDesktopItems
, ffmpeg , ffmpeg_4
, glew , glew
, libffi , libffi
, libsForQt5 , libsForQt5
@ -59,7 +59,7 @@ stdenv.mkDerivation (self: {
buildInputs = [ buildInputs = [
SDL2 SDL2
ffmpeg ffmpeg_4
(glew.override { enableEGL = forceWayland; }) (glew.override { enableEGL = forceWayland; })
libzip libzip
snappy snappy

3
pkgs/applications/emulators/retroarch/cores.nix
View file

@ -7,6 +7,7 @@
, curl , curl
, fetchFromGitHub , fetchFromGitHub
, ffmpeg , ffmpeg
, ffmpeg_4
, fluidsynth , fluidsynth
, gettext , gettext
, hexdump , hexdump
@ -759,7 +760,7 @@ in
ppsspp = mkLibretroCore { ppsspp = mkLibretroCore {
core = "ppsspp"; core = "ppsspp";
extraNativeBuildInputs = [ cmake pkg-config python3 ]; extraNativeBuildInputs = [ cmake pkg-config python3 ];
extraBuildInputs = [ libGLU libGL libzip ffmpeg snappy xorg.libX11 ]; extraBuildInputs = [ libGLU libGL libzip ffmpeg_4 snappy xorg.libX11 ];
makefile = "Makefile"; makefile = "Makefile";
cmakeFlags = [ cmakeFlags = [
"-DLIBRETRO=ON" "-DLIBRETRO=ON"

4
pkgs/applications/graphics/digikam/default.nix
View file

@ -24,7 +24,7 @@
, boost , boost
, eigen , eigen
, exiv2 , exiv2
, ffmpeg , ffmpeg_4
, flex , flex
, graphviz , graphviz
, imagemagick , imagemagick
@ -70,7 +70,7 @@ mkDerivation rec {
boost boost
eigen eigen
exiv2 exiv2
ffmpeg ffmpeg_4
flex flex
graphviz graphviz
imagemagick imagemagick

4
pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix
View file

@ -16,7 +16,7 @@
, kwayland , kwayland
, lz4 , lz4
, xxHash , xxHash
, ffmpeg , ffmpeg_4
, openalSoft , openalSoft
, minizip , minizip
, libopus , libopus
@ -132,7 +132,7 @@ stdenv.mkDerivation rec {
qtsvg qtsvg
lz4 lz4
xxHash xxHash
ffmpeg ffmpeg_4
openalSoft openalSoft
minizip minizip
libopus libopus

4
pkgs/applications/science/biology/febio-studio/default.nix
View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, cmake, zlib, libglvnd, libGLU, wrapQtAppsHook { lib, stdenv, fetchFromGitHub, cmake, zlib, libglvnd, libGLU, wrapQtAppsHook
, sshSupport ? true, openssl, libssh , sshSupport ? true, openssl, libssh
, tetgenSupport ? true, tetgen , tetgenSupport ? true, tetgen
, ffmpegSupport ? true, ffmpeg , ffmpegSupport ? true, ffmpeg_4
, dicomSupport ? false, dcmtk , dicomSupport ? false, dcmtk
, withModelRepo ? true , withModelRepo ? true
, withCadFeatures ? false , withCadFeatures ? false
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
buildInputs = [ zlib libglvnd libGLU openssl libssh ] buildInputs = [ zlib libglvnd libGLU openssl libssh ]
++ lib.optional sshSupport openssl ++ lib.optional sshSupport openssl
++ lib.optional tetgenSupport tetgen ++ lib.optional tetgenSupport tetgen
++ lib.optional ffmpegSupport ffmpeg ++ lib.optional ffmpegSupport ffmpeg_4
++ lib.optional dicomSupport dcmtk ++ lib.optional dicomSupport dcmtk
; ;

4
pkgs/applications/science/networking/sumo/default.nix
View file

@ -1,4 +1,4 @@
{ lib, bzip2, cmake, eigen, fetchFromGitHub, ffmpeg, fox_1_6, gdal, { lib, bzip2, cmake, eigen, fetchFromGitHub, ffmpeg_4, fox_1_6, gdal,
git, gl2ps, gpp , gtest, jdk, libGL, libGLU, libX11, libjpeg, git, gl2ps, gpp , gtest, jdk, libGL, libGLU, libX11, libjpeg,
libpng, libtiff, libxcrypt, openscenegraph , proj, python3, libpng, libtiff, libxcrypt, openscenegraph , proj, python3,
python3Packages, stdenv, swig, xercesc, xorg, zlib }: python3Packages, stdenv, swig, xercesc, xorg, zlib }:
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
bzip2 bzip2
eigen eigen
ffmpeg ffmpeg_4
fox_1_6 fox_1_6
gdal gdal
gl2ps gl2ps

4
pkgs/applications/video/bino3d/default.nix
View file

@ -1,4 +1,4 @@
{ mkDerivation, lib, fetchurl, pkg-config, ffmpeg, glew, libass, openal, qtbase }: { mkDerivation, lib, fetchurl, pkg-config, ffmpeg_4, glew, libass, openal, qtbase }:
mkDerivation rec { mkDerivation rec {
pname = "bino"; pname = "bino";
@ -11,7 +11,7 @@ mkDerivation rec {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ ffmpeg glew libass openal qtbase ]; buildInputs = [ ffmpeg_4 glew libass openal qtbase ];
enableParallelBuilding = true; enableParallelBuilding = true;

6
pkgs/applications/video/bombono/default.nix
View file

@ -8,7 +8,7 @@
, dvdplusrwtools , dvdplusrwtools
, enca , enca
, cdrkit , cdrkit
, ffmpeg , ffmpeg_4
, gettext , gettext
, gtk2 , gtk2
, gtkmm2 , gtkmm2
@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
dvdauthor dvdauthor
dvdplusrwtools dvdplusrwtools
enca enca
ffmpeg ffmpeg_4
gtk2 gtk2
gtkmm2 gtkmm2
libdvdread libdvdread
@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
# fix iso authoring # fix iso authoring
install -Dt $out/share/bombono/resources/scons_authoring tools/scripts/SConsTwin.py install -Dt $out/share/bombono/resources/scons_authoring tools/scripts/SConsTwin.py
wrapProgram $out/bin/bombono-dvd --prefix PATH : ${lib.makeBinPath [ ffmpeg dvdauthor cdrkit ]} wrapProgram $out/bin/bombono-dvd --prefix PATH : ${lib.makeBinPath [ ffmpeg_4 dvdauthor cdrkit ]}
''; '';
meta = with lib; { meta = with lib; {

4
pkgs/applications/video/ccextractor/default.nix
View file

@ -9,7 +9,7 @@
, makeWrapper , makeWrapper
, tesseract4 , tesseract4
, leptonica , leptonica
, ffmpeg , ffmpeg_4
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
buildInputs = [ zlib ] buildInputs = [ zlib ]
++ lib.optional (!stdenv.isLinux) libiconv ++ lib.optional (!stdenv.isLinux) libiconv
++ lib.optionals enableOcr [ leptonica tesseract4 ffmpeg ]; ++ lib.optionals enableOcr [ leptonica tesseract4 ffmpeg_4 ];
cmakeFlags = [ cmakeFlags = [
# file RPATH_CHANGE could not write new RPATH: # file RPATH_CHANGE could not write new RPATH:

4
pkgs/applications/video/dvdstyler/default.nix
View file

@ -7,7 +7,7 @@
, docbook-xsl-nons , docbook-xsl-nons
, dvdauthor , dvdauthor
, dvdplusrwtools , dvdplusrwtools
, ffmpeg , ffmpeg_4
, flex , flex
, fontconfig , fontconfig
, gettext , gettext
@ -61,7 +61,7 @@ in stdenv.mkDerivation rec {
cdrtools cdrtools
dvdauthor dvdauthor
dvdplusrwtools dvdplusrwtools
ffmpeg ffmpeg_4
fontconfig fontconfig
glib glib
libexif libexif

4
pkgs/applications/video/mplayer/default.nix
View file

@ -1,4 +1,4 @@
{ config, lib, stdenv, fetchurl, fetchsvn, pkg-config, freetype, yasm, ffmpeg { config, lib, stdenv, fetchurl, fetchsvn, pkg-config, freetype, yasm, ffmpeg_4
, aalibSupport ? true, aalib , aalibSupport ? true, aalib
, fontconfigSupport ? true, fontconfig, freefont_ttf , fontconfigSupport ? true, fontconfig, freefont_ttf
, fribidiSupport ? true, fribidi , fribidiSupport ? true, fribidi
@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ pkg-config yasm ]; nativeBuildInputs = [ pkg-config yasm ];
buildInputs = with lib; buildInputs = with lib;
[ freetype ffmpeg ] [ freetype ffmpeg_4 ]
++ optional aalibSupport aalib ++ optional aalibSupport aalib
++ optional fontconfigSupport fontconfig ++ optional fontconfigSupport fontconfig
++ optional fribidiSupport fribidi ++ optional fribidiSupport fribidi

4
pkgs/applications/video/olive-editor/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub { lib, stdenv, fetchFromGitHub
, pkg-config, which, qmake, wrapQtAppsHook , pkg-config, which, qmake, wrapQtAppsHook
, qtmultimedia, frei0r, opencolorio_1, ffmpeg-full, CoreFoundation }: , qtmultimedia, frei0r, opencolorio_1, ffmpeg_4, CoreFoundation }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "olive-editor"; pname = "olive-editor";
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
ffmpeg-full ffmpeg_4
frei0r frei0r
opencolorio_1 opencolorio_1
qtmultimedia qtmultimedia

4
pkgs/applications/video/simplescreenrecorder/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, mkDerivation, fetchFromGitHub, alsa-lib, ffmpeg, libjack2, libX11, libXext, libXinerama, qtx11extras { lib, stdenv, mkDerivation, fetchFromGitHub, alsa-lib, ffmpeg_4, libjack2, libX11, libXext, libXinerama, qtx11extras
, libXfixes, libGLU, libGL, pkg-config, libpulseaudio, libv4l, qtbase, qttools, cmake, ninja , libXfixes, libGLU, libGL, pkg-config, libpulseaudio, libv4l, qtbase, qttools, cmake, ninja
}: }:
@ -30,7 +30,7 @@ mkDerivation rec {
nativeBuildInputs = [ pkg-config cmake ninja ]; nativeBuildInputs = [ pkg-config cmake ninja ];
buildInputs = [ buildInputs = [
alsa-lib ffmpeg libjack2 libX11 libXext libXfixes libXinerama libGLU libGL alsa-lib ffmpeg_4 libjack2 libX11 libXext libXfixes libXinerama libGLU libGL
libpulseaudio libv4l qtbase qttools qtx11extras libpulseaudio libv4l qtbase qttools qtx11extras
]; ];

4
pkgs/applications/video/webcamoid/default.nix
View file

@ -1,6 +1,6 @@
{ lib, fetchFromGitHub, pkg-config, libxcb, mkDerivation, cmake { lib, fetchFromGitHub, pkg-config, libxcb, mkDerivation, cmake
, qtbase, qtdeclarative, qtquickcontrols, qtquickcontrols2 , qtbase, qtdeclarative, qtquickcontrols, qtquickcontrols2
, ffmpeg-full, gst_all_1, libpulseaudio, alsa-lib, jack2 , ffmpeg_4, gst_all_1, libpulseaudio, alsa-lib, jack2
, v4l-utils }: , v4l-utils }:
mkDerivation rec { mkDerivation rec {
pname = "webcamoid"; pname = "webcamoid";
@ -16,7 +16,7 @@ mkDerivation rec {
buildInputs = [ buildInputs = [
libxcb libxcb
qtbase qtdeclarative qtquickcontrols qtquickcontrols2 qtbase qtdeclarative qtquickcontrols qtquickcontrols2
ffmpeg-full ffmpeg_4
gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gstreamer gst_all_1.gst-plugins-base
alsa-lib libpulseaudio jack2 alsa-lib libpulseaudio jack2
v4l-utils v4l-utils

4
pkgs/development/libraries/libextractor/default.nix
View file

@ -13,7 +13,7 @@
# ''; # '';
# See also <https://nixos.org/nixpkgs/manual/#sec-language-gnome>. # See also <https://nixos.org/nixpkgs/manual/#sec-language-gnome>.
, gtkSupport ? true, glib, gtk3 , gtkSupport ? true, glib, gtk3
, videoSupport ? true, ffmpeg, libmpeg2 , videoSupport ? true, ffmpeg_4, libmpeg2
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
] ++ lib.optionals gstreamerSupport ] ++ lib.optionals gstreamerSupport
([ gst_all_1.gstreamer ] ++ gstPlugins gst_all_1) ([ gst_all_1.gstreamer ] ++ gstPlugins gst_all_1)
++ lib.optionals gtkSupport [ glib gtk3 ] ++ lib.optionals gtkSupport [ glib gtk3 ]
++ lib.optionals videoSupport [ ffmpeg libmpeg2 ]; ++ lib.optionals videoSupport [ ffmpeg_4 libmpeg2 ];
configureFlags = [ configureFlags = [
"--disable-ltdl-install" "--disable-ltdl-install"

4
pkgs/development/libraries/libqtav/default.nix
View file

@ -10,7 +10,7 @@
, libX11 , libX11
, libass , libass
, openal , openal
, ffmpeg , ffmpeg_4
, libuchardet , libuchardet
, alsa-lib , alsa-lib
, libpulseaudio , libpulseaudio
@ -30,7 +30,7 @@ mkDerivation rec {
libX11 libX11
libass libass
openal openal
ffmpeg ffmpeg_4
libuchardet libuchardet
alsa-lib alsa-lib
libpulseaudio libpulseaudio

4
pkgs/development/libraries/mediastreamer/default.nix
View file

@ -2,7 +2,7 @@
, bzrtp , bzrtp
, cmake , cmake
, fetchFromGitLab , fetchFromGitLab
, ffmpeg , ffmpeg_4
, glew , glew
, gsm , gsm
, lib , lib
@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
bzrtp bzrtp
ortp ortp
ffmpeg ffmpeg_4
glew glew
libX11 libX11
libXext libXext

4
pkgs/development/libraries/pangolin/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, doxygen, libGL, glew { stdenv, lib, fetchFromGitHub, cmake, pkg-config, doxygen, libGL, glew
, xorg, ffmpeg, libjpeg, libpng, libtiff, eigen , xorg, ffmpeg_4, libjpeg, libpng, libtiff, eigen
, Carbon ? null, Cocoa ? null , Carbon ? null, Cocoa ? null
}: }:
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
libGL libGL
glew glew
xorg.libX11 xorg.libX11
ffmpeg ffmpeg_4
libjpeg libjpeg
libpng libpng
libtiff libtiff

10
pkgs/development/libraries/xine-lib/default.nix
View file

@ -5,7 +5,7 @@
, aalib , aalib
, alsa-lib , alsa-lib
, autoconf , autoconf
, ffmpeg , ffmpeg_4
, flac , flac
, libGL , libGL
, libGLU , 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"; url = "https://raw.githubusercontent.com/archlinux/svntogit-community/209ae10d59d29c13633b75aa327cf937f3ff0725/trunk/010-xine-lib-libcaca-0.99.beta20-fix.patch";
sha256 = "088141x1yp84y09x3s01v21yzas2bwavxz9v30z5hyq6c3syrmgr"; 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 = [ nativeBuildInputs = [
@ -58,7 +52,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
aalib aalib
alsa-lib alsa-lib
ffmpeg ffmpeg_4 # xine-lib 1.2.12 should support ffmpeg_5
flac flac
libGL libGL
libGLU libGLU

4
pkgs/development/octave-modules/video/default.nix
View file

@ -3,7 +3,7 @@
, lib , lib
, fetchurl , fetchurl
, pkg-config , pkg-config
, ffmpeg , ffmpeg_4
}: }:
buildOctavePackage rec { buildOctavePackage rec {
@ -20,7 +20,7 @@ buildOctavePackage rec {
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
ffmpeg ffmpeg_4
]; ];
meta = with lib; { meta = with lib; {

4
pkgs/development/python-modules/ffmpeg-python/default.nix
View file

@ -1,7 +1,7 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, ffmpeg , ffmpeg_4
, future , future
, pytest-mock , pytest-mock
, pytestCheckHook , pytestCheckHook
@ -36,7 +36,7 @@ buildPythonPackage rec {
patches = [ patches = [
(substituteAll { (substituteAll {
src = ./ffmpeg-location.patch; src = ./ffmpeg-location.patch;
inherit ffmpeg; ffmpeg = ffmpeg_4;
}) })
]; ];

4
pkgs/games/hedgewars/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg, freeglut { stdenv, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg_4, freeglut
, lib, fetchurl, cmake, pkg-config, lua5_1, SDL2, SDL2_mixer , lib, fetchurl, cmake, pkg-config, lua5_1, SDL2, SDL2_mixer
, zlib, libpng, libGL, libGLU, physfs , zlib, libpng, libGL, libGLU, physfs
, qtbase, qttools, wrapQtAppsHook , qtbase, qttools, wrapQtAppsHook
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image
fpc lua5_1 fpc lua5_1
llvm # hard-requirement on aarch64, for some reason not strictly necessary on x86-64 llvm # hard-requirement on aarch64, for some reason not strictly necessary on x86-64
ffmpeg freeglut physfs ffmpeg_4 freeglut physfs
qtbase qtbase
] ++ lib.optional withServer ghc; ] ++ lib.optional withServer ghc;

4
pkgs/games/openrw/default.nix
View file

@ -11,7 +11,7 @@
, openal , openal
, SDL2 , SDL2
, boost , boost
, ffmpeg , ffmpeg_4
, Cocoa , Cocoa
, OpenAL }: , OpenAL }:
@ -35,7 +35,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ buildInputs = [
sfml libGLU libGL bullet glm libmad openal SDL2 boost ffmpeg sfml libGLU libGL bullet glm libmad openal SDL2 boost ffmpeg_4
] ++ lib.optionals stdenv.isDarwin [ OpenAL Cocoa ]; ] ++ lib.optionals stdenv.isDarwin [ OpenAL Cocoa ];
meta = with lib; { meta = with lib; {

4
pkgs/games/performous/default.nix
View file

@ -5,7 +5,7 @@
, aubio , aubio
, boost , boost
, cmake , cmake
, ffmpeg , ffmpeg_4
, gettext , gettext
, git , git
, glew , glew
@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
SDL2 SDL2
aubio aubio
boost boost
ffmpeg ffmpeg_4
glew glew
glibmm glibmm
glm glm

4
pkgs/games/stepmania/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, cmake, nasm { stdenv, lib, fetchFromGitHub, cmake, nasm
, gtk2, glib, ffmpeg, alsa-lib, libmad, libogg, libvorbis , gtk2, glib, ffmpeg_4, alsa-lib, libmad, libogg, libvorbis
, glew, libpulseaudio, udev , glew, libpulseaudio, udev
}: }:
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake nasm ]; nativeBuildInputs = [ cmake nasm ];
buildInputs = [ buildInputs = [
gtk2 glib ffmpeg alsa-lib libmad libogg libvorbis gtk2 glib ffmpeg_4 alsa-lib libmad libogg libvorbis
glew libpulseaudio udev glew libpulseaudio udev
]; ];

9
pkgs/games/ultrastardx/default.nix
View file

@ -14,7 +14,7 @@
, SDL2_gfx , SDL2_gfx
, SDL2_mixer , SDL2_mixer
, SDL2_net, SDL2_ttf , SDL2_net, SDL2_ttf
, ffmpeg , ffmpeg_4
, sqlite , sqlite
, zlib , zlib
, libX11 , libX11
@ -26,7 +26,7 @@ let
sharedLibs = [ sharedLibs = [
pcre portaudio freetype pcre portaudio freetype
SDL2 SDL2_image SDL2_gfx SDL2_mixer SDL2_net SDL2_ttf SDL2 SDL2_image SDL2_gfx SDL2_mixer SDL2_net SDL2_ttf
sqlite lua zlib libX11 libGLU libGL ffmpeg sqlite lua zlib libX11 libGLU libGL ffmpeg_4
]; ];
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
@ -48,9 +48,8 @@ in stdenv.mkDerivation rec {
# ultrastardx binds to libffmpeg (and sublibs), specifying a very restrictive # ultrastardx binds to libffmpeg (and sublibs), specifying a very restrictive
# upper bounds on the minor versions of .so files. # upper bounds on the minor versions of .so files.
# We can assume ffmpeg won’t break any major ABI compatibility, since their # We can assume ffmpeg_4 won’t break any major ABI compatibility, since it's
# patch version seems to always stay at 100, # effectively EOL
# and their minor version changes quite frequently.
sed \ sed \
-e 's/^ LIBAVCODEC_MAX_VERSION_MINOR.*$/ LIBAVCODEC_MAX_VERSION_MINOR = 1000;/' \ -e 's/^ LIBAVCODEC_MAX_VERSION_MINOR.*$/ LIBAVCODEC_MAX_VERSION_MINOR = 1000;/' \
-i src/lib/ffmpeg-4.0/avcodec.pas -i src/lib/ffmpeg-4.0/avcodec.pas

4
pkgs/misc/screensavers/electricsheep/default.nix
View file

@ -3,7 +3,7 @@
, fetchFromGitHub , fetchFromGitHub
, autoreconfHook , autoreconfHook
, wxGTK32 , wxGTK32
, ffmpeg , ffmpeg_4
, lua5_1 , lua5_1
, curl , curl
, libpng , libpng
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
wxGTK32 wxGTK32
ffmpeg ffmpeg_4
lua5_1 lua5_1
curl curl
libpng libpng

4
pkgs/os-specific/linux/guvcview/default.nix
View file

@ -5,7 +5,7 @@
, pkg-config , pkg-config
, portaudio , portaudio
, SDL2 , SDL2
, ffmpeg , ffmpeg_4
, udev , udev
, libusb1 , libusb1
, libv4l , libv4l
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
SDL2 SDL2
alsa-lib alsa-lib
ffmpeg ffmpeg_4
libusb1 libusb1
libv4l libv4l
portaudio portaudio

4
pkgs/servers/hydron/default.nix
View file

@ -3,7 +3,7 @@
, fetchFromGitHub , fetchFromGitHub
, gitUpdater , gitUpdater
, pkg-config , pkg-config
, ffmpeg , ffmpeg_4
}: }:
buildGoModule rec { buildGoModule rec {
@ -21,7 +21,7 @@ buildGoModule rec {
proxyVendor = true; proxyVendor = true;
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ ffmpeg ]; buildInputs = [ ffmpeg_4 ];
passthru.updateScript = gitUpdater { passthru.updateScript = gitUpdater {
rev-prefix = "v"; rev-prefix = "v";

4
pkgs/servers/misc/oven-media-engine/default.nix
View file

@ -7,7 +7,7 @@
, perl , perl
, openssl , openssl
, zlib , zlib
, ffmpeg , ffmpeg_4
, libvpx , libvpx
, libopus , libopus
, libuuid , libuuid
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ bc pkg-config perl ]; nativeBuildInputs = [ bc pkg-config perl ];
buildInputs = [ openssl srt zlib ffmpeg libvpx libopus srtp jemalloc pcre2 libuuid hiredis ]; buildInputs = [ openssl srt zlib ffmpeg_4 libvpx libopus srtp jemalloc pcre2 libuuid hiredis ];
preBuild = '' preBuild = ''
patchShebangs core/colorg++ patchShebangs core/colorg++

4
pkgs/servers/tvheadend/default.nix
View file

@ -14,7 +14,7 @@
, bzip2 , bzip2
, dbus , dbus
, dtv-scan-tables , dtv-scan-tables
, ffmpeg , ffmpeg_4
, gettext , gettext
, gnutar , gnutar
, gzip , gzip
@ -64,7 +64,7 @@ in stdenv.mkDerivation {
avahi avahi
bzip2 bzip2
dbus dbus
ffmpeg ffmpeg_4 # depends on libav
gettext gettext
gzip gzip
libiconv libiconv

4
pkgs/tools/audio/acoustid-fingerprinter/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, cmake, pkg-config, qt4, taglib, chromaprint, ffmpeg }: { lib, stdenv, fetchurl, fetchpatch, cmake, pkg-config, qt4, taglib, chromaprint, ffmpeg_4 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "acoustid-fingerprinter"; pname = "acoustid-fingerprinter";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ qt4 taglib chromaprint ffmpeg ]; buildInputs = [ qt4 taglib chromaprint ffmpeg_4 ];
cmakeFlags = [ "-DTAGLIB_MIN_VERSION=${lib.getVersion taglib}" ]; cmakeFlags = [ "-DTAGLIB_MIN_VERSION=${lib.getVersion taglib}" ];

4
pkgs/tools/audio/loudgain/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, ffmpeg, libebur128 { lib, stdenv, fetchFromGitHub, cmake, pkg-config, ffmpeg_4, libebur128
, libresample, taglib, zlib }: , libresample, taglib, zlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ ffmpeg libebur128 libresample taglib zlib ]; buildInputs = [ ffmpeg_4 libebur128 libresample taglib zlib ];
postInstall = '' postInstall = ''
sed -e "1aPATH=$out/bin:\$PATH" -i "$out/bin/rgbpm" sed -e "1aPATH=$out/bin:\$PATH" -i "$out/bin/rgbpm"

4
pkgs/tools/graphics/vulkan-cts/default.nix
View file

@ -2,7 +2,7 @@
, fetchFromGitHub , fetchFromGitHub
, fetchurl , fetchurl
, cmake , cmake
, ffmpeg , ffmpeg_4
, libdrm , libdrm
, libglvnd , libglvnd
, libffi , libffi
@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: {
''; '';
buildInputs = [ buildInputs = [
ffmpeg ffmpeg_4
libdrm libdrm
libffi libffi
libglvnd libglvnd

4
pkgs/tools/video/harvid/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, ffmpeg, libjpeg, libpng, pkg-config }: { lib, stdenv, fetchFromGitHub, fetchpatch, ffmpeg_4, libjpeg, libpng, pkg-config }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "harvid"; pname = "harvid";
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ ffmpeg libjpeg libpng ]; buildInputs = [ ffmpeg_4 libjpeg libpng ];
makeFlags = [ "DESTDIR=$(out)" "libdir=\"/lib\"" ]; makeFlags = [ "DESTDIR=$(out)" "libdir=\"/lib\"" ];

4
pkgs/tools/video/untrunc-anthwlock/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, ffmpeg, libui }: { lib, stdenv, fetchFromGitHub, ffmpeg_4, libui }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "untrunc-anthwlock"; pname = "untrunc-anthwlock";
@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "14i2lq68q990hnm2kkfamlsi67bcml85zl8yjsyxc5h8ncc2f3dp"; sha256 = "14i2lq68q990hnm2kkfamlsi67bcml85zl8yjsyxc5h8ncc2f3dp";
}; };
buildInputs = [ ffmpeg libui ]; buildInputs = [ ffmpeg_4 libui ];
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild

4
pkgs/tools/video/xjadeo/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, autoreconfHook, fetchFromGitHub, ffmpeg, freetype, libGLU { lib, stdenv, autoreconfHook, fetchFromGitHub, ffmpeg_4, freetype, libGLU
, libjack2, liblo, libX11, libXv, pkg-config, portmidi, xorg }: , libjack2, liblo, libX11, libXv, pkg-config, portmidi, xorg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkg-config ]; nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ buildInputs = [
ffmpeg ffmpeg_4
libjack2 libjack2
libX11 libX11
xorg.libXext xorg.libXext