treewide: use ffmpeg_3 explicitly if not wanted otherwise

After making `ffmpeg` point to the latest `ffmpeg_4`, all packages that
used `ffmpeg` without requiring a specific version now use ffmpeg_3
explicitly so they shouldn't change.
This commit is contained in:
Doron Behar 2020-06-07 15:39:09 +03:00 committed by Jon
parent 8e1dcea3d5
commit 01d4e2fe33
135 changed files with 279 additions and 279 deletions

View File

@ -3,7 +3,7 @@
, qca-qt5, qjson, qtquickcontrols2, qtscript, qtwebengine
, karchive, kcmutils, kconfig, kdnssd, kguiaddons, kinit, kirigami2, knewstuff, knotifyconfig, ktexteditor, kwindowsystem
, fftw, phonon, plasma-framework, threadweaver
, curl, ffmpeg, gdk-pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras
, curl, ffmpeg_3, gdk-pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras
}:
mkDerivation rec {
@ -26,7 +26,7 @@ mkDerivation rec {
qca-qt5 qjson qtquickcontrols2 qtscript qtwebengine
karchive kcmutils kconfig kdnssd kguiaddons kinit kirigami2 knewstuff knotifyconfig ktexteditor kwindowsystem
phonon plasma-framework threadweaver
curl fftw ffmpeg gdk-pixbuf libaio libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static
curl fftw ffmpeg_3 gdk-pixbuf libaio libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static
pcre snappy taglib taglib_extras
];

View File

@ -8,7 +8,7 @@
, curl
, dbus
, doxygen
, ffmpeg
, ffmpeg_3
, fftw
, fftwSinglePrec
, flac
@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
cppunit
curl
dbus
ffmpeg
ffmpeg_3
fftw
fftwSinglePrec
flac
@ -149,8 +149,8 @@ stdenv.mkDerivation rec {
sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript
patchShebangs ./tools/
substituteInPlace libs/ardour/video_tools_paths.cc \
--replace 'ffmpeg_exe = X_("");' 'ffmpeg_exe = X_("${ffmpeg}/bin/ffmpeg");' \
--replace 'ffprobe_exe = X_("");' 'ffprobe_exe = X_("${ffmpeg}/bin/ffprobe");'
--replace 'ffmpeg_exe = X_("");' 'ffmpeg_exe = X_("${ffmpeg_3}/bin/ffmpeg");' \
--replace 'ffprobe_exe = X_("");' 'ffprobe_exe = X_("${ffmpeg_3}/bin/ffprobe");'
'';
postInstall = ''

View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, gettext, glib, gtk3
, libmowgli, dbus-glib, libxml2, xorg, gnome3, alsaLib
, libpulseaudio, libjack2, fluidsynth, libmad, libogg, libvorbis
, libcdio, libcddb, flac, ffmpeg, mpg123, libcue, libmms, libbs2b
, libcdio, libcddb, flac, ffmpeg_3, mpg123, libcue, libmms, libbs2b
, libsndfile, libmodplug, libsamplerate, soxr, lirc, curl, wavpack
, neon, faad2, lame, libnotify, libsidplayfp
}:
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
gettext glib gtk3 libmowgli dbus-glib libxml2
xorg.libXcomposite gnome3.adwaita-icon-theme alsaLib libjack2
libpulseaudio fluidsynth libmad libogg libvorbis libcdio
libcddb flac ffmpeg mpg123 libcue libmms libbs2b libsndfile
libcddb flac ffmpeg_3 mpg123 libcue libmms libbs2b libsndfile
libmodplug libsamplerate soxr lirc curl wavpack neon faad2
lame libnotify libsidplayfp
];

View File

@ -2,7 +2,7 @@
mkDerivation, lib, fetchurl, fetchpatch,
gettext, pkgconfig,
qtbase,
alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk-pixbuf, lame, libbs2b,
alsaLib, curl, faad2, ffmpeg_3, flac, fluidsynth, gdk-pixbuf, lame, libbs2b,
libcddb, libcdio, libcue, libjack2, libmad, libmms, libmodplug,
libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp,
libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr,
@ -45,7 +45,7 @@ mkDerivation {
qtbase
# Plugin dependencies
alsaLib curl faad2 ffmpeg flac fluidsynth gdk-pixbuf lame libbs2b libcddb
alsaLib curl faad2 ffmpeg_3 flac fluidsynth gdk-pixbuf lame libbs2b libcddb
libcdio libcue libjack2 libmad libmms libmodplug libmowgli
libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile
libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack

View File

@ -1,6 +1,6 @@
{ stdenv, fetchzip, wxGTK30, pkgconfig, file, gettext,
libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame,
expat, libid3tag, ffmpeg, soundtouch, /*, portaudio - given up fighting their portaudio.patch */
expat, libid3tag, ffmpeg_3, soundtouch, /*, portaudio - given up fighting their portaudio.patch */
autoconf, automake, libtool
}:
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
buildInputs = [
file gettext wxGTK30 expat alsaLib
libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil wxGTK30.gtk
ffmpeg libmad lame libvorbis flac soundtouch
ffmpeg_3 libmad lame libvorbis flac soundtouch
]; #ToDo: detach sbsms
enableParallelBuilding = true;

View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, freetype, gdk-pixbuf
, wrapGAppsHook, gtk2, gtk3, harfbuzz, jdk, lib, xorg
, libbsd, libjack2, libpng, ffmpeg
, libbsd, libjack2, libpng, ffmpeg_3
, libxkbcommon
, makeWrapper, pixman, autoPatchelfHook
, xdg_utils, zenity, zlib }:
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
];
binPath = lib.makeBinPath [
xdg_utils zenity ffmpeg
xdg_utils zenity ffmpeg_3
];
installPhase = ''

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ffmpeg, sox }:
{ stdenv, fetchurl, ffmpeg_3, sox }:
stdenv.mkDerivation rec {
pname = "bs1770gain";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1p6yz5q7czyf9ard65sp4kawdlkg40cfscr3b24znymmhs3p7rbk";
};
buildInputs = [ ffmpeg sox ];
buildInputs = [ ffmpeg_3 sox ];
NIX_CFLAGS_COMPILE = "-Wno-error";

View File

@ -10,7 +10,7 @@
, withTaglib ? true, taglib, taglib_extras
, withHttpStream ? true, qtmultimedia
, withReplaygain ? true, ffmpeg, speex, mpg123
, withReplaygain ? true, ffmpeg_3, speex, mpg123
, withMtp ? true, libmtp
, withOnlineServices ? true
, withDevices ? true, udisks2
@ -50,7 +50,7 @@ in mkDerivation {
buildInputs = [ qtbase qtsvg ]
++ lib.optionals withTaglib [ taglib taglib_extras ]
++ lib.optionals withReplaygain [ ffmpeg speex mpg123 ]
++ lib.optionals withReplaygain [ ffmpeg_3 speex mpg123 ]
++ lib.optional withHttpStream qtmultimedia
++ lib.optional withCdda cdparanoia
++ lib.optional withCddb libcddb

View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, alsaLib, file, fluidsynth, ffmpeg, jack2,
{ stdenv, fetchFromGitHub, alsaLib, file, fluidsynth, ffmpeg_3, jack2,
liblo, libpulseaudio, libsndfile, pkgconfig, python3Packages,
which, withFrontend ? true,
withQt ? true, qtbase ? null, wrapQtAppsHook ? null,
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
] ++ optional withFrontend pyqt5;
buildInputs = [
file liblo alsaLib fluidsynth ffmpeg jack2 libpulseaudio libsndfile
file liblo alsaLib fluidsynth ffmpeg_3 jack2 libpulseaudio libsndfile
] ++ pythonPath
++ optional withQt qtbase
++ optional withGtk2 gtk2

View File

@ -17,7 +17,7 @@
, aacSupport ? true, faad2 ? null
, opusSupport ? true, opusfile ? null
, wavpackSupport ? false, wavpack ? null
, ffmpegSupport ? false, ffmpeg ? null
, ffmpegSupport ? false, ffmpeg_3 ? null
, apeSupport ? true, yasm ? null
# misc plugins
, zipSupport ? true, libzip ? null
@ -45,7 +45,7 @@ assert cdaSupport -> (libcdio != null && libcddb != null);
assert aacSupport -> faad2 != null;
assert opusSupport -> opusfile != null;
assert zipSupport -> libzip != null;
assert ffmpegSupport -> ffmpeg != null;
assert ffmpegSupport -> ffmpeg_3 != null;
assert apeSupport -> yasm != null;
assert artworkSupport -> imlib2 != null;
assert hotkeysSupport -> libX11 != null;
@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
++ optional aacSupport faad2
++ optional opusSupport opusfile
++ optional zipSupport libzip
++ optional ffmpegSupport ffmpeg
++ optional ffmpegSupport ffmpeg_3
++ optional apeSupport yasm
++ optional artworkSupport imlib2
++ optional hotkeysSupport libX11

View File

@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
};
propagatedBuildInputs = with pkgs; [
python3Packages.numpy flac vorbis-tools ffmpeg faad2 lame
python3Packages.numpy flac vorbis-tools ffmpeg_3 faad2 lame
];
# There are no tests

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl
, pkgconfig, cmake, python, ffmpeg, phonon, automoc4
, pkgconfig, cmake, python, ffmpeg_3, phonon, automoc4
, chromaprint, docbook_xml_dtd_45, docbook_xsl, libxslt
, id3lib, taglib, mp4v2, flac, libogg, libvorbis
, zlib, readline , qtbase, qttools, qtmultimedia, qtquickcontrols
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ wrapQtAppsHook ];
buildInputs = with stdenv.lib;
[ pkgconfig cmake python ffmpeg phonon automoc4
[ pkgconfig cmake python ffmpeg_3 phonon automoc4
chromaprint docbook_xml_dtd_45 docbook_xsl libxslt
id3lib taglib mp4v2 flac libogg libvorbis zlib readline
qtbase qttools qtmultimedia qtquickcontrols ];

View File

@ -14,7 +14,7 @@
, musepackSupport ? true, libmpc, libmpcdec, taglib
, vorbisSupport ? true, libvorbis
, speexSupport ? true, speex
, ffmpegSupport ? true, ffmpeg
, ffmpegSupport ? true, ffmpeg_3
, sndfileSupport ? true, libsndfile
, wavpackSupport ? true, wavpack
# Misc
@ -60,7 +60,7 @@ in stdenv.mkDerivation rec {
++ stdenv.lib.optionals musepackSupport [ libmpc libmpcdec taglib ]
++ opt vorbisSupport libvorbis
++ opt speexSupport speex
++ opt (ffmpegSupport && !withffmpeg4) ffmpeg
++ opt (ffmpegSupport && !withffmpeg4) ffmpeg_3
++ opt (ffmpegSupport && withffmpeg4) ffmpeg_4
++ opt sndfileSupport libsndfile
++ opt wavpackSupport wavpack

View File

@ -4,7 +4,7 @@
, boost
, curl
, fetchFromGitHub
, ffmpeg
, ffmpeg_3
, lame
, libev
, libmicrohttpd
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
alsaLib
boost
curl
ffmpeg
ffmpeg_3
lame
libev
libmicrohttpd

View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, pkgconfig, libao, json_c, libgcrypt, ffmpeg, curl }:
{ fetchurl, stdenv, pkgconfig, libao, json_c, libgcrypt, ffmpeg_3, curl }:
stdenv.mkDerivation rec {
name = "pianobar-2020.04.05";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
libao json_c libgcrypt ffmpeg curl
libao json_c libgcrypt ffmpeg_3 curl
];
makeFlags = [ "PREFIX=$(out)" ];

View File

@ -4,7 +4,7 @@
, curl, libmms
# input plugins
, libmad, taglib, libvorbis, libogg, flac, libmpcdec, libmodplug, libsndfile
, libcdio, cdparanoia, libcddb, faad2, ffmpeg, wildmidi
, libcdio, cdparanoia, libcddb, faad2, ffmpeg_3, wildmidi
# output plugins
, alsaLib, libpulseaudio
# effect plugins
@ -44,7 +44,7 @@ mkDerivation rec {
curl libmms
# input plugins
libmad taglib libvorbis libogg flac libmpcdec libmodplug libsndfile
libcdio cdparanoia libcddb faad2 ffmpeg wildmidi
libcdio cdparanoia libcddb faad2 ffmpeg_3 wildmidi
# output plugins
alsaLib libpulseaudio
# effect plugins

View File

@ -1,7 +1,7 @@
{ lib
, fetchFromGitHub
, substituteAll
, ffmpeg
, ffmpeg_3
, python3Packages
, sox
}:
@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
(
substituteAll {
src = ./ffmpeg-location.patch;
inherit ffmpeg;
ffmpeg = ffmpeg_3;
}
)
];

View File

@ -2,7 +2,7 @@
, alsaLib, flac, libmad, libvorbis, mpg123
, dsdSupport ? true
, faad2Support ? true, faad2
, ffmpegSupport ? true, ffmpeg
, ffmpegSupport ? true, ffmpeg_3
, opusSupport ? true, opusfile
, resampleSupport ? true, soxr
, sslSupport ? true, openssl
@ -35,7 +35,7 @@ in stdenv.mkDerivation {
buildInputs = [ alsaLib flac libmad libvorbis mpg123 ]
++ optional faad2Support faad2
++ optional ffmpegSupport ffmpeg
++ optional ffmpegSupport ffmpeg_3
++ optional opusSupport opusfile
++ optional resampleSupport soxr
++ optional sslSupport openssl;

View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, flex, bison, pkgconfig, zlib, libtiff, libpng, fftw
, cairo, readline, ffmpeg, makeWrapper, wxGTK30, netcdf, blas
, cairo, readline, ffmpeg_3, makeWrapper, wxGTK30, netcdf, blas
, proj, gdal, geos, sqlite, postgresql, libmysqlclient, python2Packages, libLAS, proj-datumgrid
}:
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo proj
readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql libmysqlclient blas
readline ffmpeg_3 makeWrapper wxGTK30 netcdf geos postgresql libmysqlclient blas
libLAS proj-datumgrid ]
++ (with python2Packages; [ python dateutil wxPython30 numpy ]);

View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig
, ffmpeg, gtk3, imagemagick, libarchive, libspectre, libwebp, poppler
, ffmpeg_3, gtk3, imagemagick, libarchive, libspectre, libwebp, poppler
}:
stdenv.mkDerivation (rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation (rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ffmpeg gtk3 imagemagick libarchive libspectre libwebp poppler ];
buildInputs = [ ffmpeg_3 gtk3 imagemagick libarchive libspectre libwebp poppler ];
prePatch = "patchShebangs .";

View File

@ -1,7 +1,7 @@
{
mkDerivation, lib,
extra-cmake-modules,
ffmpeg, kio
ffmpeg_3, kio
}:
mkDerivation {
@ -11,5 +11,5 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ ffmpeg kio ];
buildInputs = [ ffmpeg_3 kio ];
}

View File

@ -5,7 +5,7 @@
, flac, lame, libmad, libmpcdec, libvorbis
, libsamplerate, libsndfile, taglib
, cdparanoia, cdrdao, cdrtools, dvdplusrwtools, libburn, libdvdcss, libdvdread, vcdimager
, ffmpeg, libmusicbrainz3, normalize, sox, transcode, kinit
, ffmpeg_3, libmusicbrainz3, normalize, sox, transcode, kinit
}:
mkDerivation {
@ -28,7 +28,7 @@ mkDerivation {
# cd/dvd
cdparanoia libdvdcss libdvdread
# others
ffmpeg libmusicbrainz3 shared-mime-info
ffmpeg_3 libmusicbrainz3 shared-mime-info
];
propagatedUserEnvPkgs = [ (lib.getBin kinit) ];
postFixup =

View File

@ -1,12 +1,12 @@
{ stdenv, lib, fetchurl, makeDesktopItem, makeWrapper
, alsaLib, atk, cairo, cups, curl, dbus, expat, ffmpeg, fontconfig, freetype
, alsaLib, atk, cairo, cups, curl, dbus, expat, ffmpeg_3, fontconfig, freetype
, gdk-pixbuf, glib, glibc, gnome2, gtk2, libX11, libXScrnSaver, libXcomposite
, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender
, libXtst, libopus, libpulseaudio, libxcb, nspr, nss, pango, udev, x264
}:
let libPath = lib.makeLibraryPath [
alsaLib atk cairo cups curl dbus expat ffmpeg fontconfig freetype gdk-pixbuf
alsaLib atk cairo cups curl dbus expat ffmpeg_3 fontconfig freetype gdk-pixbuf
glib glibc gnome2.GConf gtk2 libopus nspr nss pango stdenv.cc.cc udev x264
libX11 libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes
libXi libXrandr libXrender libXtst libpulseaudio libxcb

View File

@ -1,4 +1,4 @@
{ config, stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew
{ config, stdenv, lib, fetchurl, boost, cmake, ffmpeg_3, gettext, glew
, ilmbase, libXi, libX11, libXext, libXrender
, libjpeg, libpng, libsamplerate, libsndfile
, libtiff, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio2, openjpeg, python3Packages
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ] ++ optional cudaSupport addOpenGLRunpath;
buildInputs =
[ boost ffmpeg gettext glew ilmbase
[ boost ffmpeg_3 gettext glew ilmbase
freetype libjpeg libpng libsamplerate libsndfile libtiff
opencolorio openexr openimagedenoise openimageio2 openjpeg python zlib fftw jemalloc
alembic

View File

@ -1,4 +1,4 @@
{stdenv, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg, makeWrapper, perl, perlPackages, rtmpdump}:
{stdenv, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg_3, makeWrapper, perl, perlPackages, rtmpdump}:
with stdenv.lib;
@ -26,7 +26,7 @@ perlPackages.buildPerlPackage rec {
installPhase = ''
mkdir -p $out/bin $out/share/man/man1
cp get_iplayer $out/bin
wrapProgram $out/bin/get_iplayer --suffix PATH : ${makeBinPath [ atomicparsley ffmpeg flvstreamer rtmpdump ]} --prefix PERL5LIB : $PERL5LIB
wrapProgram $out/bin/get_iplayer --suffix PATH : ${makeBinPath [ atomicparsley ffmpeg_3 flvstreamer rtmpdump ]} --prefix PERL5LIB : $PERL5LIB
cp get_iplayer.1 $out/share/man/man1
'';

View File

@ -4,7 +4,7 @@
, withCC ? true, opencc
, withEpwing ? true, libeb
, withExtraTiff ? true, libtiff
, withFFmpeg ? true, libao, ffmpeg
, withFFmpeg ? true, libao, ffmpeg_3
, withMultimedia ? true
, withZim ? true, zstd }:
@ -39,7 +39,7 @@ mkDerivation rec {
++ stdenv.lib.optional withCC opencc
++ stdenv.lib.optional withEpwing libeb
++ stdenv.lib.optional withExtraTiff libtiff
++ stdenv.lib.optionals withFFmpeg [ libao ffmpeg ]
++ stdenv.lib.optionals withFFmpeg [ libao ffmpeg_3 ]
++ stdenv.lib.optional withZim zstd;
qmakeFlags = with stdenv.lib; [

View File

@ -28,7 +28,7 @@ in buildFHSUserEnv {
# DGen // TODO: libarchive is broken
# Dolphin
bluez ffmpeg gettext portaudio wxGTK30 miniupnpc mbedtls lzo sfml gsm
bluez ffmpeg_3 gettext portaudio wxGTK30 miniupnpc mbedtls lzo sfml gsm
wavpack orc nettle gmp pcre vulkan-loader
# DOSBox

View File

@ -5,7 +5,7 @@
, cryptopp
, curl
, fetchFromGitHub
, ffmpeg
, ffmpeg_3
, freeimage
, gcc-unwrapped
, libmediainfo
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
c-ares
cryptopp
curl
ffmpeg
ffmpeg_3
freeimage
gcc-unwrapped
libmediainfo

View File

@ -1,5 +1,5 @@
{ stdenv, autoconf, automake, c-ares, cryptopp, curl, doxygen, fetchFromGitHub
, fetchpatch, ffmpeg, libmediainfo, libraw, libsodium, libtool, libuv, libzen
, fetchpatch, ffmpeg_3, libmediainfo, libraw, libsodium, libtool, libuv, libzen
, lsb-release, mkDerivation, pkgconfig, qtbase, qttools, sqlite, swig, unzip
, wget }:
@ -21,7 +21,7 @@ mkDerivation rec {
c-ares
cryptopp
curl
ffmpeg
ffmpeg_3
libmediainfo
libraw
libsodium

View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, perl
, alsaLib, libevdev, libopus, udev, SDL2
, ffmpeg, pkgconfig, xorg, libvdpau, libpulseaudio, libcec
, ffmpeg_3, pkgconfig, xorg, libvdpau, libpulseaudio, libcec
, curl, expat, avahi, enet, libuuid, libva
}:
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake perl ];
buildInputs = [
alsaLib libevdev libopus udev SDL2
ffmpeg pkgconfig xorg.libxcb libvdpau libpulseaudio libcec
ffmpeg_3 pkgconfig xorg.libxcb libvdpau libpulseaudio libcec
xorg.libpthreadstubs curl expat avahi enet libuuid libva
];

View File

@ -1,4 +1,4 @@
{ lib, python3Packages, ffmpeg }:
{ lib, python3Packages, ffmpeg_3 }:
python3Packages.buildPythonApplication rec {
version = "2.0";
@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
blinker
];
makeWrapperArgs = [ "--prefix PATH : ${ffmpeg}/bin" ];
makeWrapperArgs = [ "--prefix PATH : ${ffmpeg_3}/bin" ];
# No tests included
doCheck = false;

View File

@ -16,7 +16,7 @@
, xorg
, libXScrnSaver, libXcursor, libXtst, libGLU, libGL
, protobuf, speechd, libXdamage, cups
, ffmpeg, libxslt, libxml2, at-spi2-core
, ffmpeg_3, libxslt, libxml2, at-spi2-core
, jre
, pipewire_0_2
@ -93,7 +93,7 @@ let
libpng libcap
xdg_utils minizip libwebp
libusb1 re2 zlib
ffmpeg libxslt libxml2
ffmpeg_3 libxslt libxml2
# harfbuzz # in versions over 63 harfbuzz and freetype are being built together
# so we can't build with one from system and other from source
] ++ (if (versionRange "0" "84") then [ yasm ] else [ nasm ]);

View File

@ -48,7 +48,7 @@
, gnused
, gnugrep
, gnupg
, ffmpeg
, ffmpeg_3
, runtimeShell
, systemLocale ? config.i18n.defaultLocale or "en-US"
}:
@ -134,7 +134,7 @@ stdenv.mkDerivation {
libpulseaudio
(lib.getDev libpulseaudio)
systemd
ffmpeg
ffmpeg_3
] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [
stdenv.cc.cc
];

View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchgit, makeDesktopItem
, pkgconfig, autoconf213, alsaLib, bzip2, cairo
, dbus, dbus-glib, ffmpeg, file, fontconfig, freetype
, dbus, dbus-glib, ffmpeg_3, file, fontconfig, freetype
, gnome2, gnum4, gtk2, hunspell, libevent, libjpeg
, libnotify, libstartup_notification, makeWrapper
, libGLU, libGL, perl, python2, libpulseaudio
@ -11,7 +11,7 @@
let
libPath = lib.makeLibraryPath [ ffmpeg ];
libPath = lib.makeLibraryPath [ ffmpeg_3 ];
gtkVersion = if withGTK3 then "3" else "2";
in stdenv.mkDerivation rec {
@ -48,7 +48,7 @@ in stdenv.mkDerivation rec {
];
buildInputs = [
alsaLib bzip2 cairo dbus dbus-glib ffmpeg fontconfig freetype
alsaLib bzip2 cairo dbus dbus-glib ffmpeg_3 fontconfig freetype
gnome2.GConf gtk2 hunspell libevent libjpeg libnotify
libstartup_notification libGLU libGL
libpulseaudio unzip yasm zip zlib

View File

@ -29,7 +29,7 @@
# Media support (implies audio support)
, mediaSupport ? true
, ffmpeg
, ffmpeg_3
, gmp
@ -83,7 +83,7 @@ let
]
++ optionals pulseaudioSupport [ libpulseaudio ]
++ optionals mediaSupport [
ffmpeg
ffmpeg_3
];
# Library search path for the fte transport

View File

@ -15,7 +15,7 @@
, glibc
, libXScrnSaver, libXcursor, libXtst, libGLU, libGL
, protobuf, speechd, libXdamage, cups
, ffmpeg, libxslt, libxml2, at-spi2-core
, ffmpeg_3, libxslt, libxml2, at-spi2-core
, jre
# optional dependencies
@ -93,7 +93,7 @@ let
libpng libcap
xdg_utils yasm minizip libwebp
libusb1 re2 zlib
ffmpeg libxslt libxml2
ffmpeg_3 libxslt libxml2
# harfbuzz # in versions over 63 harfbuzz and freetype are being built together
# so we can't build with one from system and other from source
];

View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE
, libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr
, alsaLib, dbus, cups, libexif, ffmpeg, systemd
, alsaLib, dbus, cups, libexif, ffmpeg_3, systemd
, freetype, fontconfig, libXft, libXrender, libxcb, expat
, libuuid
, gstreamer, gst-plugins-base, libxml2
@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
buildInputs = [
stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb
libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
atk at-spi2-atk at-spi2-core alsaLib dbus cups gtk3 gdk-pixbuf libexif ffmpeg systemd
atk at-spi2-atk at-spi2-core alsaLib dbus cups gtk3 gdk-pixbuf libexif ffmpeg_3 systemd
freetype fontconfig libXrender libuuid expat glib nss nspr
gstreamer libxml2 gst-plugins-base pango cairo gnome2.GConf
libdrm mesa

View File

@ -1,5 +1,5 @@
{stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig, gst_all_1
, cairo, mpg123, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg
, cairo, mpg123, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg_3
, gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx
}:
stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [zlib openssl libre librem cairo mpg123
alsaLib SDL libv4l celt libsndfile srtp ffmpeg gsm speex portaudio spandsp libuuid
alsaLib SDL libv4l celt libsndfile srtp ffmpeg_3 gsm speex portaudio spandsp libuuid
ccache libvpx
] ++ (with gst_all_1; [ gstreamer gst-libav gst-plugins-base gst-plugins-bad gst-plugins-good ]);
makeFlags = [

View File

@ -10,7 +10,7 @@
, cyrus_sasl
, fetchFromGitLab
, fetchurl
, ffmpeg
, ffmpeg_3
, gdk-pixbuf
, glib
, gnused
@ -137,7 +137,7 @@ mkDerivation rec {
bzrtp
cairo
cyrus_sasl
ffmpeg
ffmpeg_3
gdk-pixbuf
glib
gtk2

View File

@ -2,7 +2,7 @@
, libtoxcore
, libpthreadstubs, libXdmcp, libXScrnSaver
, qtbase, qtsvg, qttools, qttranslations
, ffmpeg, filter-audio, libexif, libsodium, libopus
, ffmpeg_3, filter-audio, libexif, libsodium, libopus
, libvpx, openal, pcre, qrencode, sqlcipher
, AVFoundation ? null }:
@ -25,7 +25,7 @@ in mkDerivation {
libtoxcore
libpthreadstubs libXdmcp libXScrnSaver
qtbase qtsvg qttranslations
ffmpeg filter-audio libexif libopus libsodium
ffmpeg_3 filter-audio libexif libopus libsodium
libvpx openal pcre qrencode sqlcipher
] ++ lib.optionals stdenv.isDarwin [ AVFoundation] ;

View File

@ -13,7 +13,7 @@
, libsndfile
, dbus
, dbus_cplusplus
, ffmpeg
, ffmpeg_3
, udev
, pcre
, gsm
@ -101,7 +101,7 @@ stdenv.mkDerivation {
libsndfile
dbus
dbus_cplusplus
ffmpeg
ffmpeg_3
udev
pcre
gsm

View File

@ -4,7 +4,7 @@
, curl, sqlite, openssl
, libuuid, openh264, libv4l, libxkbfile, libXv, zlib, libXmu
, libXtst, libXdamage, pam, libXfixes, libXrender, libjpeg_original
, ffmpeg
, ffmpeg_3
}:
let
# Sky is linked to the libjpeg 8 version and checks for the version number in the code.
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
file
qt5.qtbase
SDL
ffmpeg
ffmpeg_3
sqlite
openssl
openh264

View File

@ -1,5 +1,5 @@
{ mkDerivation, lib, fetchFromGitHub, pkg-config, python3, cmake, ninja
, qtbase, qtimageformats, libsForQt5, hunspell, xdg_utils, ffmpeg, openalSoft
, qtbase, qtimageformats, libsForQt5, hunspell, xdg_utils, ffmpeg_3, openalSoft
, lzma, lz4, xxHash, zlib, minizip, openssl, libtgvoip, microsoft_gsl, tl-expected
, range-v3
}:
@ -21,7 +21,7 @@ mkDerivation rec {
nativeBuildInputs = [ pkg-config python3 cmake ninja ];
buildInputs = [
qtbase qtimageformats ffmpeg openalSoft lzma lz4 xxHash libsForQt5.libdbusmenu
qtbase qtimageformats ffmpeg_3 openalSoft lzma lz4 xxHash libsForQt5.libdbusmenu
zlib minizip openssl hunspell libtgvoip microsoft_gsl tl-expected range-v3
];

View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2
, libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv, qmake, ffmpeg
, libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv, qmake, ffmpeg_3
, qtmultimedia, qtx11extras, qttools }:
stdenv.mkDerivation rec {
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig qmake ];
buildInputs = [
speex libupnp gpgme gnome3.libgnome-keyring glib libssh qtmultimedia qtx11extras qttools
protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ffmpeg
protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ffmpeg_3
];
preConfigure = ''

View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, alsaLib, ffmpeg, glib, openssl
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, alsaLib, ffmpeg_3, glib, openssl
, pcre, zlib, libX11, libXcursor, libXdamage, libXext, libXi, libXinerama
, libXrandr, libXrender, libXv, libXtst, libxkbcommon, libxkbfile, wayland
, gstreamer, gst-plugins-base, gst-plugins-good, libunwind, orc, libxslt
@ -50,7 +50,7 @@ in stdenv.mkDerivation rec {
[
alsaLib
cups
ffmpeg
ffmpeg_3
glib
gst-plugins-base
gst-plugins-good

View File

@ -12,7 +12,7 @@
, libass
, fftw
, ffms
, ffmpeg
, ffmpeg_3
, pkg-config
, zlib
, icu
@ -85,7 +85,7 @@ stdenv.mkDerivation
libass
fftw
ffms
ffmpeg
ffmpeg_3
zlib
icu
boost

View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
, cairo, ffmpeg, ffms, libjpeg, log4cpp, pango
, cairo, ffmpeg_3, ffms, libjpeg, log4cpp, pango
, avxeditSupport ? false, qt4 ? null
}:
@ -29,7 +29,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ cairo ffmpeg ffms libjpeg log4cpp pango ]
buildInputs = [ cairo ffmpeg_3 ffms libjpeg log4cpp pango ]
++ optional avxeditSupport qt4;
meta = with stdenv.lib; {

View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, wrapGAppsHook, gtk2, boost, gtkmm2, scons,
mjpegtools, libdvdread, dvdauthor, gettext, dvdplusrwtools, libxmlxx, ffmpeg,
mjpegtools, libdvdread, dvdauthor, gettext, dvdplusrwtools, libxmlxx, ffmpeg_3,
enca, pkgconfig, fetchpatch }:
let fetchPatchFromAur = {name, sha256}:
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk2 gtkmm2 mjpegtools libdvdread dvdauthor boost dvdplusrwtools
libxmlxx ffmpeg enca
libxmlxx ffmpeg_3 enca
];
prefixKey = "PREFIX=";

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeDesktopItem, ffmpeg
{ stdenv, fetchurl, makeDesktopItem, ffmpeg_3
, qmake, qttools, mkDerivation
, qtbase, qtdeclarative, qtlocation, qtquickcontrols2, qtwebchannel, qtwebengine
}:
@ -13,13 +13,13 @@ mkDerivation rec {
url = "https://download.clipgrab.org/${pname}-${version}.tar.gz";
};
buildInputs = [ ffmpeg qtbase qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine ];
buildInputs = [ ffmpeg_3 qtbase qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine ];
nativeBuildInputs = [ qmake qttools ];
postPatch = stdenv.lib.optionalString (ffmpeg != null) ''
postPatch = stdenv.lib.optionalString (ffmpeg_3 != null) ''
substituteInPlace converter_ffmpeg.cpp \
--replace '"ffmpeg"' '"${ffmpeg.bin}/bin/ffmpeg"' \
--replace '"ffmpeg ' '"${ffmpeg.bin}/bin/ffmpeg '
--replace '"ffmpeg"' '"${ffmpeg_3.bin}/bin/ffmpeg"' \
--replace '"ffmpeg ' '"${ffmpeg_3.bin}/bin/ffmpeg '
'';
qmakeFlags = [ "clipgrab.pro" ];

View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, python3Packages, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor
{ stdenv, fetchFromGitHub, python3Packages, ffmpeg_3, mplayer, vcdimager, cdrkit, dvdauthor
, gtk3, gettext, wrapGAppsHook, gdk-pixbuf, gobject-introspection }:
let
@ -30,11 +30,11 @@ in buildPythonApplication {
];
buildInputs = [
ffmpeg
ffmpeg_3
];
propagatedBuildInputs = [
gtk3 pygobject3 gdk-pixbuf dbus-python ffmpeg mplayer dvdauthor vcdimager cdrkit urllib3 setuptools
gtk3 pygobject3 gdk-pixbuf dbus-python ffmpeg_3 mplayer dvdauthor vcdimager cdrkit urllib3 setuptools
];
postPatch = ''

View File

@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg, imagemagick, lame, mjpegtools, sox, transcode, vorbis-tools, runtimeShell }:
{ stdenv, lib, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg_3, imagemagick, lame, mjpegtools, sox, transcode, vorbis-tools, runtimeShell }:
let
binPath = lib.makeBinPath [ cdrtools dvdauthor ffmpeg imagemagick lame mjpegtools sox transcode vorbis-tools ];
binPath = lib.makeBinPath [ cdrtools dvdauthor ffmpeg_3 imagemagick lame mjpegtools sox transcode vorbis-tools ];
wrapper = writeScript "dvd-slideshow.sh" ''
#!${runtimeShell}

View File

@ -1,7 +1,7 @@
{ lib
, buildPythonApplication
, fetchPypi
, ffmpeg
, ffmpeg_3
, tqdm
}:
@ -14,7 +14,7 @@ buildPythonApplication rec {
sha256 = "18dpck9grnr3wgbjvdh4mjlx0zfwcxpy4rnpmc39in0yk3w7li2x";
};
propagatedBuildInputs = [ ffmpeg tqdm ];
propagatedBuildInputs = [ ffmpeg_3 tqdm ];
checkPhase = ''
$out/bin/ffmpeg-normalize --help > /dev/null

View File

@ -1,4 +1,4 @@
{ lib, python3Packages, gtk3, gobject-introspection, ffmpeg, wrapGAppsHook }:
{ lib, python3Packages, gtk3, gobject-introspection, ffmpeg_3, wrapGAppsHook }:
with python3Packages;
buildPythonApplication rec {
@ -17,7 +17,7 @@ buildPythonApplication rec {
];
preFixup = ''
gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg ]})
gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg_3 ]})
'';
meta = with lib; {

View File

@ -1,5 +1,5 @@
{ stdenv, mkDerivation, fetchurl, autoPatchelfHook
, ffmpeg, openssl, qtbase, zlib, pkgconfig
, ffmpeg_3, openssl, qtbase, zlib, pkgconfig
}:
let
@ -29,7 +29,7 @@ in mkDerivation {
nativeBuildInputs = [ autoPatchelfHook pkgconfig ];
buildInputs = [ ffmpeg openssl qtbase zlib ];
buildInputs = [ ffmpeg_3 openssl qtbase zlib ];
installPhase = ''
runHook preInstall

View File

@ -1,5 +1,5 @@
{ lib, buildPythonApplication, fetchFromGitHub, pythonOlder, file, fetchpatch
, cairo, ffmpeg, sox, xdg_utils, texlive
, cairo, ffmpeg_3, sox, xdg_utils, texlive
, colour, numpy, pillow, progressbar, scipy, tqdm, opencv , pycairo, pydub
, pbr, fetchPypi
}:
@ -28,14 +28,14 @@ buildPythonApplication rec {
pycairo
pydub
cairo sox ffmpeg xdg_utils
cairo sox ffmpeg_3 xdg_utils
];
# Test with texlive to see whether it works but don't propagate
# because it's huge and optional
# TODO: Use smaller TexLive distribution
# Doesn't need everything but it's hard to figure out what it needs
checkInputs = [ cairo sox ffmpeg xdg_utils texlive.combined.scheme-full ];
checkInputs = [ cairo sox ffmpeg_3 xdg_utils texlive.combined.scheme-full ];
# Simple test and complex test with LaTeX
checkPhase = ''

View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
, ffmpeg, libjpeg, libmicrohttpd }:
, ffmpeg_3, libjpeg, libmicrohttpd }:
stdenv.mkDerivation rec {
pname = "motion";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ ffmpeg libjpeg libmicrohttpd ];
buildInputs = [ ffmpeg_3 libjpeg libmicrohttpd ];
meta = with stdenv.lib; {
description = "Monitors the video signal from cameras";

View File

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

View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, qt4, pkgconfig, boost, expat, cairo, python2Packages,
cmake, flex, bison, pango, librsvg, librevenge, libxml2, libcdr, libzip,
poppler, imagemagick, openexr, ffmpeg, opencolorio, openimageio,
poppler, imagemagick, openexr, ffmpeg_3, opencolorio, openimageio,
qmake4Hook, libpng, libGL, lndir }:
let
@ -68,7 +68,7 @@ let
sha256 = "0s196i9fkgr9iw92c94mxgs1lkxbhynkf83vmsgrldflmf0xjky7";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
libpng ffmpeg openexr opencolorio openimageio boost libGL
libpng ffmpeg_3 openexr opencolorio openimageio boost libGL
seexpr
];
})

View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub
, pkgconfig, cmake, doxygen
, libopenshot-audio, imagemagick, ffmpeg
, libopenshot-audio, imagemagick, ffmpeg_3
, swig, python3
, unittest-cpp, cppzmq, zeromq
, qtbase, qtmultimedia }:
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig cmake doxygen ];
buildInputs =
[ imagemagick ffmpeg swig python3 unittest-cpp
[ imagemagick ffmpeg_3 swig python3 unittest-cpp
cppzmq zeromq qtbase qtmultimedia ];
LIBOPENSHOT_AUDIO_DIR = libopenshot-audio;

View File

@ -15,7 +15,7 @@
, glib
, cairo
, keybinder3
, ffmpeg
, ffmpeg_3
, python3
, libxml2
, gst_all_1
@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
'';
preFixup = ''
gappsWrapperArgs+=(--prefix PATH : ${stdenv.lib.makeBinPath [ which ffmpeg gifski ]})
gappsWrapperArgs+=(--prefix PATH : ${stdenv.lib.makeBinPath [ which ffmpeg_3 gifski ]})
'';
meta = with stdenv.lib; {

View File

@ -6,7 +6,7 @@
, qtquickcontrols
, qtimageformats
, qtxmlpatterns
, ffmpeg
, ffmpeg_3
, guvcview
, cmake
, ninja
@ -40,7 +40,7 @@ mkDerivation rec {
v4l-utils
libv4l
pcre
ffmpeg
ffmpeg_3
guvcview
qwt
];

View File

@ -1,4 +1,4 @@
{ stdenv, mkDerivation, fetchurl, alsaLib, ffmpeg, libjack2, libX11, libXext, qtx11extras
{ stdenv, mkDerivation, fetchurl, alsaLib, ffmpeg_3, libjack2, libX11, libXext, qtx11extras
, libXfixes, libGLU, libGL, pkgconfig, libpulseaudio, qtbase, cmake, ninja
}:
@ -25,7 +25,7 @@ mkDerivation rec {
nativeBuildInputs = [ pkgconfig cmake ninja ];
buildInputs = [
alsaLib ffmpeg libjack2 libX11 libXext libXfixes libGLU libGL
alsaLib ffmpeg_3 libjack2 libX11 libXext libXfixes libGLU libGL
libpulseaudio qtbase qtx11extras
];

View File

@ -1,4 +1,4 @@
{ stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }:
{ stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg_3 }:
pythonPackages.buildPythonApplication rec {
version = "1.4.1";
@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec {
checkInputs = with pythonPackages; [ pytest mock requests-mock freezegun ];
propagatedBuildInputs = (with pythonPackages; [ pycryptodome requests iso-639 iso3166 websocket_client isodate ]) ++ [ rtmpdump ffmpeg ];
propagatedBuildInputs = (with pythonPackages; [ pycryptodome requests iso-639 iso3166 websocket_client isodate ]) ++ [ rtmpdump ffmpeg_3 ];
meta = with stdenv.lib; {
homepage = "https://github.com/streamlink/streamlink";

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchgit, vdr, alsaLib, fetchFromGitHub
, libvdpau, libxcb, xcbutilwm, graphicsmagick, libav, pcre, xorgserver, ffmpeg
, libvdpau, libxcb, xcbutilwm, graphicsmagick, libav, pcre, xorgserver, ffmpeg_3
, libiconv, boost, libgcrypt, perl, utillinux, groff, libva, xorg, ncurses
, callPackage
}: let
@ -52,7 +52,7 @@ in {
name = "vdr-vaapidevice-0.7.0";
buildInputs = [
vdr libxcb xcbutilwm ffmpeg
vdr libxcb xcbutilwm ffmpeg_3
alsaLib
libvdpau # vdpau
libva # va-api

View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, autoreconfHook
, libarchive, perl, xorg, libdvdnav, libbluray
, zlib, a52dec, libmad, faad2, ffmpeg, alsaLib
, zlib, a52dec, libmad, faad2, ffmpeg_3, alsaLib
, pkgconfig, dbus, fribidi, freefont_ttf, libebml, libmatroska
, libvorbis, libtheora, speex, lua5, libgcrypt, libgpgerror, libupnp
, libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
# which are not included here for no other reason that nobody has mentioned
# needing them
buildInputs = [
zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
zlib a52dec libmad faad2 ffmpeg_3 alsaLib libdvdnav libdvdnav.libdvdread
libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpgerror
libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec
systemd gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libarchive

View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, mkDerivation
, pkgconfig, qtbase, qttools, qmake, qtmultimedia, qtx11extras, alsaLib, libv4l, libXrandr
, ffmpeg
, ffmpeg_3
}:
mkDerivation rec {
@ -35,7 +35,7 @@ mkDerivation rec {
'';
postConfigure = ''
substituteInPlace settings/QvkSettings.cpp --subst-var-by ffmpeg ${ffmpeg}
substituteInPlace settings/QvkSettings.cpp --subst-var-by ffmpeg ${ffmpeg_3}
'';
meta = with stdenv.lib; {

View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, makeWrapper, ffmpeg, imagemagick, dzen2, xorg }:
{ stdenv, fetchFromGitHub, makeWrapper, ffmpeg_3, imagemagick, dzen2, xorg }:
stdenv.mkDerivation {
pname = "xscast-unstable";
@ -21,7 +21,7 @@ stdenv.mkDerivation {
patchShebangs $out/bin
wrapProgram "$out/bin/xscast" \
--prefix PATH : ${stdenv.lib.makeBinPath [ ffmpeg dzen2 xorg.xwininfo xorg.xinput xorg.xmodmap imagemagick ]}
--prefix PATH : ${stdenv.lib.makeBinPath [ ffmpeg_3 dzen2 xorg.xwininfo xorg.xinput xorg.xmodmap imagemagick ]}
runHook postInstall
'';

View File

@ -8,7 +8,7 @@
, qtx11extras
, dtkcore
, dtkwidget
, ffmpeg
, ffmpeg_3
, ffmpegthumbnailer
, mpv
, pulseaudio
@ -41,7 +41,7 @@ mkDerivation rec {
buildInputs = [
dtkcore
dtkwidget
ffmpeg
ffmpeg_3
ffmpegthumbnailer
libdvdnav
libdvdread

View File

@ -1,4 +1,4 @@
{ stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsaLib, libav_0_8, setJavaClassPath }:
{ stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg_3, libGL, atk, alsaLib, libav_0_8, setJavaClassPath }:
let
common = javaVersion:
@ -117,7 +117,7 @@ let
}.${javaVersion}
}:${
stdenv.lib.strings.makeLibraryPath [ glibc xorg.libXxf86vm xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender
glib zlib bzip2 alsaLib fontconfig freetype pango gtk3 gtk2 cairo gdk-pixbuf atk ffmpeg libGL ]}"
glib zlib bzip2 alsaLib fontconfig freetype pango gtk3 gtk2 cairo gdk-pixbuf atk ffmpeg_3 libGL ]}"
for f in $(find $out -type f -perm -0100); do
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true

View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, writeText, gradleGen, pkgconfig, perl, cmake
, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg, python, ruby
, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg_3, python, ruby
, openjdk11-bootstrap }:
let
@ -19,7 +19,7 @@ let
sha256 = "1h7qsylr7rnwnbimqjyn3whszp9kv4h3gpicsrb3mradxc9yv194";
};
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg ];
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg_3 ];
nativeBuildInputs = [ gradle_ perl pkgconfig cmake gperf python ruby ];
dontUseCmakeConfigure = true;

View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradleGen
, pkgconfig, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib
, ffmpeg, python, ruby }:
, ffmpeg_3, python, ruby }:
let
major = "14";
@ -21,7 +21,7 @@ let
sha256 = "16aj15xksc266gv3y42m0g277pfvp71901lrngndcnpr7i2zshnr";
};
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg ];
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg_3 ];
nativeBuildInputs = [ gradle_ perl pkgconfig cmake gperf python ruby ];
dontUseCmakeConfigure = true;

View File

@ -19,7 +19,7 @@
, glib
, libxml2
, libav_0_8
, ffmpeg
, ffmpeg_3
, libxslt
, libGL
, freetype
@ -171,7 +171,7 @@ let result = stdenv.mkDerivation rec {
* libXt is only needed on amd64
*/
libraries =
[stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++
[stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++
(if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []);
rpath = stdenv.lib.strings.makeLibraryPath libraries;

View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath
, zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, libGL, alsaLib
, zulu, glib, libxml2, libav_0_8, ffmpeg_3, libxslt, libGL, alsaLib
, fontconfig, freetype, gnome2, cairo, gdk-pixbuf, atk, xorg
, swingSupport ? true }:
@ -15,7 +15,7 @@ let
extension = if stdenv.isDarwin then "zip" else "tar.gz";
libraries = [
stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL
stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL
xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango
gnome2.gtk cairo gdk-pixbuf atk
] ++ (lib.optionals swingSupport (with xorg; [

View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath
, zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, libGL, alsaLib
, zulu, glib, libxml2, libav_0_8, ffmpeg_3, libxslt, libGL, alsaLib
, fontconfig, freetype, gnome2, cairo, gdk-pixbuf, atk, xorg, zlib
, swingSupport ? true }:
@ -15,7 +15,7 @@ let
extension = if stdenv.isDarwin then "zip" else "tar.gz";
libraries = [
stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL
stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL
xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango
gnome2.gtk cairo gdk-pixbuf atk zlib
] ++ (lib.optionals swingSupport (with xorg; [

View File

@ -724,7 +724,7 @@ self: super: builtins.intersectAttrs super {
dhall_1_32_0 = dontCheck super.dhall_1_32_0;
cut-the-crap =
let path = pkgs.stdenv.lib.makeBinPath [ pkgs.ffmpeg ];
let path = pkgs.stdenv.lib.makeBinPath [ pkgs.ffmpeg_3 ];
in overrideCabal (addBuildTool super.cut-the-crap pkgs.makeWrapper) (_drv: {
postInstall = ''
wrapProgram $out/bin/cut-the-crap \

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, python2Packages, pkgconfig, SDL2
, libpng, ffmpeg, freetype, glew, libGL, libGLU, fribidi, zlib
, libpng, ffmpeg_3, freetype, glew, libGL, libGLU, fribidi, zlib
, glib
}:
@ -32,13 +32,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
python cython wrapPython tkinter
SDL2 libpng ffmpeg freetype glew libGLU libGL fribidi zlib pygame_sdl2 glib
SDL2 libpng ffmpeg_3 freetype glew libGLU libGL fribidi zlib pygame_sdl2 glib
];
pythonPath = [ pygame_sdl2 tkinter ];
RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: path) [
SDL2 SDL2.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out libGLU libGL fribidi zlib
SDL2 SDL2.dev libpng ffmpeg_3 ffmpeg_3.out freetype glew.dev glew.out libGLU libGL fribidi zlib
]);
buildPhase = ''

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, boost, ffmpeg }:
{ stdenv, fetchurl, cmake, boost, ffmpeg_3 }:
stdenv.mkDerivation rec {
pname = "chromaprint";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ boost ffmpeg ];
buildInputs = [ boost ffmpeg_3 ];
cmakeFlags = [ "-DBUILD_EXAMPLES=ON" "-DBUILD_TOOLS=ON" ];

View File

@ -1,4 +1,4 @@
{ fetchFromGitHub, stdenv, ffmpeg, cmake, libpng, pkgconfig, libjpeg
{ fetchFromGitHub, stdenv, ffmpeg_3, cmake, libpng, pkgconfig, libjpeg
}:
stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ ffmpeg libpng libjpeg ];
buildInputs = [ ffmpeg_3 libpng libjpeg ];
meta = with stdenv.lib; {
homepage = "https://github.com/dirkvdb/ffmpegthumbnailer";

View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, zlib, ffmpeg, pkgconfig }:
{ stdenv, fetchFromGitHub, zlib, ffmpeg_3, pkgconfig }:
stdenv.mkDerivation rec {
pname = "ffms";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-fPIC";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ zlib ffmpeg ];
buildInputs = [ zlib ffmpeg_3 ];
# ffms includes a built-in vapoursynth plugin, see:
# https://github.com/FFMS/ffms2#avisynth-and-vapoursynth-plugin

View File

@ -1,7 +1,7 @@
{
mkDerivation, lib, copyPathsToStore,
extra-cmake-modules,
attr, ebook_tools, exiv2, ffmpeg, karchive, kcoreaddons, ki18n, poppler, qtbase, qtmultimedia, taglib
attr, ebook_tools, exiv2, ffmpeg_3, karchive, kcoreaddons, ki18n, poppler, qtbase, qtmultimedia, taglib
}:
mkDerivation {
@ -9,7 +9,7 @@ mkDerivation {
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
attr ebook_tools exiv2 ffmpeg karchive kcoreaddons ki18n poppler qtbase qtmultimedia
attr ebook_tools exiv2 ffmpeg_3 karchive kcoreaddons ki18n poppler qtbase qtmultimedia
taglib
];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);

View File

@ -13,11 +13,11 @@
# '';
# See also <https://nixos.org/nixpkgs/manual/#sec-language-gnome>.
, gtkSupport ? true, glib ? null, gtk3 ? null
, videoSupport ? true, ffmpeg ? null, libmpeg2 ? null}:
, videoSupport ? true, ffmpeg_3 ? null, libmpeg2 ? null}:
assert gstreamerSupport -> gst_all_1 != null && builtins.isList (gstPlugins gst_all_1);
assert gtkSupport -> glib != null && gtk3 != null;
assert videoSupport -> ffmpeg != null && libmpeg2 != null;
assert videoSupport -> ffmpeg_3 != null && libmpeg2 != null;
stdenv.mkDerivation rec {
name = "libextractor-1.9";
@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
] ++ stdenv.lib.optionals gstreamerSupport
([ gst_all_1.gstreamer ] ++ gstPlugins gst_all_1)
++ stdenv.lib.optionals gtkSupport [ glib gtk3 ]
++ stdenv.lib.optionals videoSupport [ ffmpeg libmpeg2 ];
++ stdenv.lib.optionals videoSupport [ ffmpeg_3 libmpeg2 ];
configureFlags = [
"--disable-ltdl-install"

View File

@ -11,7 +11,7 @@
, doxygen
, fetchFromGitLab
, fetchurl
, ffmpeg
, ffmpeg_3
, gdk-pixbuf
, git
, glib
@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
bzrtp
cairo
cyrus_sasl
ffmpeg
ffmpeg_3
gdk-pixbuf
git
glib

View File

@ -1,7 +1,7 @@
{ mkDerivation, lib, fetchFromGitHub, extra-cmake-modules
, qtbase, qtmultimedia, qtquick1, qttools
, libGL, libX11
, libass, openal, ffmpeg, libuchardet
, libass, openal, ffmpeg_3, libuchardet
, alsaLib, libpulseaudio, libva
}:
@ -15,7 +15,7 @@ mkDerivation rec {
buildInputs = [
qtbase qtmultimedia qtquick1
libGL libX11
libass openal ffmpeg libuchardet
libass openal ffmpeg_3 libuchardet
alsaLib libpulseaudio libva
];

View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, libX11, libpthreadstubs, libXau, libXdmcp
, libXext, libvdpau, glib, libva, ffmpeg, libGLU }:
, libXext, libvdpau, glib, libva, ffmpeg_3, libGLU }:
stdenv.mkDerivation rec {
pname = "libvdpau-va-gl";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva ffmpeg libGLU ];
buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva ffmpeg_3 libGLU ];
doCheck = false; # fails. needs DRI access

View File

@ -5,7 +5,7 @@
, doxygen
, fetchFromGitLab
, fetchpatch
, ffmpeg
, ffmpeg_3
, glew
, gsm
, intltool
@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
alsaLib
bctoolbox
bzrtp
ffmpeg
ffmpeg_3
glew
gsm
libGL

View File

@ -23,7 +23,7 @@
, enableGtk2 ? false, gtk2
, enableGtk3 ? false, gtk3
, enableVtk ? false, vtk
, enableFfmpeg ? false, ffmpeg
, enableFfmpeg ? false, ffmpeg_3
, enableGStreamer ? false, gst_all_1
, enableTesseract ? false, tesseract, leptonica
, enableTbb ? false, tbb
@ -188,7 +188,7 @@ stdenv.mkDerivation {
++ lib.optional enableWebP libwebp
++ lib.optionals enableEXR [ openexr ilmbase ]
++ lib.optional enableJPEG2K jasper
++ lib.optional enableFfmpeg ffmpeg
++ lib.optional enableFfmpeg ffmpeg_3
++ lib.optionals (enableFfmpeg && stdenv.isDarwin)
[ VideoDecodeAcceleration bzip2 ]
++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ])

View File

@ -23,7 +23,7 @@
, enableGtk2 ? false, gtk2
, enableGtk3 ? false, gtk3
, enableVtk ? false, vtk
, enableFfmpeg ? false, ffmpeg
, enableFfmpeg ? false, ffmpeg_3
, enableGStreamer ? false, gst_all_1
, enableTesseract ? false, tesseract, leptonica
, enableTbb ? false, tbb
@ -204,7 +204,7 @@ stdenv.mkDerivation {
++ lib.optional enableWebP libwebp
++ lib.optionals enableEXR [ openexr ilmbase ]
++ lib.optional enableJPEG2K jasper
++ lib.optional enableFfmpeg ffmpeg
++ lib.optional enableFfmpeg ffmpeg_3
++ lib.optionals (enableFfmpeg && stdenv.isDarwin)
[ VideoDecodeAcceleration bzip2 ]
++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ])

View File

@ -7,7 +7,7 @@
, enableTIFF ? true, libtiff
, enableEXR ? (!stdenv.isDarwin), openexr, ilmbase
, enableJPEG2K ? false, jasper # disable jasper by default (many CVE)
, enableFfmpeg ? false, ffmpeg
, enableFfmpeg ? false, ffmpeg_3
, enableGStreamer ? false, gst_all_1
, enableEigen ? true, eigen
, Cocoa, QTKit
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
++ lib.optional enableTIFF libtiff
++ lib.optionals enableEXR [ openexr ilmbase ]
++ lib.optional enableJPEG2K jasper
++ lib.optional enableFfmpeg ffmpeg
++ lib.optional enableFfmpeg ffmpeg_3
++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ])
++ lib.optional enableEigen eigen
++ lib.optionals stdenv.isDarwin [ Cocoa QTKit ]

View File

@ -11,7 +11,7 @@
curlSupport ? true, curl,
colladaSupport ? false, opencollada,
opencascadeSupport ? false, opencascade,
ffmpegSupport ? false, ffmpeg,
ffmpegSupport ? false, ffmpeg_3,
nvttSupport ? false, nvidia-texture-tools,
freetypeSupport ? true, freetype,
svgSupport ? false, librsvg,
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
++ lib.optional curlSupport curl
++ lib.optional colladaSupport opencollada
++ lib.optional opencascadeSupport opencascade
++ lib.optional ffmpegSupport ffmpeg
++ lib.optional ffmpegSupport ffmpeg_3
++ lib.optional nvttSupport nvidia-texture-tools
++ lib.optional freetypeSupport freetype
++ lib.optional svgSupport librsvg

View File

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

View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind
, glib, dbus, gst_all_1, alsaLib, ffmpeg, libjack2, udev, libva, xorg
, glib, dbus, gst_all_1, alsaLib, ffmpeg_3, libjack2, udev, libva, xorg
, sbc, SDL2, makeFontsConf
}:
@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
];
buildInputs = [
glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer
alsaLib ffmpeg libjack2 udev libva xorg.libX11 sbc SDL2
alsaLib ffmpeg_3 libjack2 udev libva xorg.libX11 sbc SDL2
];
mesonFlags = [

View File

@ -11,7 +11,7 @@
, dbus
, gst_all_1
, alsaLib
, ffmpeg
, ffmpeg_3
, libjack2
, udev
, libva
@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
alsaLib
bluez
dbus
ffmpeg
ffmpeg_3
glib
gst_all_1.gst-plugins-base
gst_all_1.gstreamer

View File

@ -14,7 +14,7 @@
, enableProprietaryCodecs ? true
, gn
, cups, darwin, openbsm, runCommand, xcbuild
, ffmpeg ? null
, ffmpeg_3 ? null
, lib, stdenv
}:
@ -152,7 +152,7 @@ EOF
libevent
] ++ optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [
ffmpeg
ffmpeg_3
] ++ optionals (!stdenv.isDarwin) [
dbus zlib minizip snappy nss protobuf jsoncpp

View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl
, pkgconfig, wxGTK
, ffmpeg, libexif
, ffmpeg_3, libexif
, cairo, pango }:
stdenv.mkDerivation rec {
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ wxGTK ffmpeg libexif ];
propagatedBuildInputs = [ wxGTK ffmpeg_3 libexif ];
buildInputs = [ cairo pango ];

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, xorg, alsaLib, libGLU, libGL, aalib
, libvorbis, libtheora, speex, zlib, perl, ffmpeg
, libvorbis, libtheora, speex, zlib, perl, ffmpeg_3
, flac, libcaca, libpulseaudio, libmng, libcdio, libv4l, vcdimager
, libmpcdec
}:
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [
xorg.libX11 xorg.libXv xorg.libXinerama xorg.libxcb xorg.libXext
alsaLib libGLU libGL aalib libvorbis libtheora speex perl ffmpeg flac
alsaLib libGLU libGL aalib libvorbis libtheora speex perl ffmpeg_3 flac
libcaca libpulseaudio libmng libcdio libv4l vcdimager libmpcdec
];

View File

@ -2,7 +2,7 @@
, buildPythonPackage
, fetchFromGitHub
, substituteAll
, ffmpeg
, ffmpeg_3
, future
, pytest
, pytestrunner
@ -24,7 +24,7 @@ buildPythonPackage rec {
(
substituteAll {
src = ./ffmpeg-location.patch;
inherit ffmpeg;
ffmpeg = ffmpeg_3;
}
)
];

View File

@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchPypi, isPy3k
, ffmpeg, async-timeout }:
, ffmpeg_3, async-timeout }:
buildPythonPackage rec {
pname = "ha-ffmpeg";
@ -12,7 +12,7 @@ buildPythonPackage rec {
sha256 = "230f2fa990c9caaff1c67c2227b64756062248083849651a9bec7d599e519a42";
};
buildInputs = [ ffmpeg ];
buildInputs = [ ffmpeg_3 ];
propagatedBuildInputs = [ async-timeout ];

View File

@ -8,7 +8,7 @@
, pytest
, numpy
, isPy3k
, ffmpeg
, ffmpeg_3
, futures
, enum34
}:
@ -23,7 +23,7 @@ buildPythonPackage rec {
};
checkInputs = [ pytest psutil ] ++ stdenv.lib.optionals isPy3k [
imageio-ffmpeg ffmpeg
imageio-ffmpeg ffmpeg_3
];
propagatedBuildInputs = [ numpy pillow ] ++ stdenv.lib.optionals (!isPy3k) [
futures

View File

@ -21,7 +21,7 @@ buildPythonPackage rec {
doCheck = false;
buildInputs = [ html5lib ];
propagatedBuildInputs = [ six beautifulsoup4 pkgs.ffmpeg pkgs.swftools pkgs.rtmpdump ];
propagatedBuildInputs = [ six beautifulsoup4 pkgs.ffmpeg_3 pkgs.swftools pkgs.rtmpdump ];
meta = with stdenv.lib; {
description = "Discover presentations and/or create a movie consisting of slides and audio track from an infoq url";

View File

@ -33,7 +33,7 @@ buildPythonPackage rec {
'';
nativeBuildInputs = [ pkgs.pkgconfig ];
buildInputs = with pkgs; [ alsaLib ffmpeg libv4l sqlite libvpx ];
buildInputs = with pkgs; [ alsaLib ffmpeg_3 libv4l sqlite libvpx ];
propagatedBuildInputs = [ cython pkgs.openssl dnspython dateutil xcaplib msrplib lxml python-otr ];
meta = with lib; {

Some files were not shown because too many files have changed in this diff Show More