Merge pull request #123366 from dotlambda/linphone-ffmpeg

linphone: use ffmpeg instead of ffmpeg_3
This commit is contained in:
Robert Schütz
2021-05-21 20:44:36 +02:00
committed by GitHub
3 changed files with 6 additions and 6 deletions
@@ -10,7 +10,7 @@
, cyrus_sasl , cyrus_sasl
, fetchFromGitLab , fetchFromGitLab
, fetchurl , fetchurl
, ffmpeg_3 , ffmpeg
, gdk-pixbuf , gdk-pixbuf
, glib , glib
, gnused , gnused
@@ -87,7 +87,7 @@ mkDerivation rec {
bzrtp bzrtp
cairo cairo
cyrus_sasl cyrus_sasl
ffmpeg_3 ffmpeg
gdk-pixbuf gdk-pixbuf
glib glib
gtk2 gtk2
@@ -10,7 +10,7 @@
, cyrus_sasl , cyrus_sasl
, doxygen , doxygen
, fetchFromGitLab , fetchFromGitLab
, ffmpeg_3 , ffmpeg
, gdk-pixbuf , gdk-pixbuf
, glib , glib
, graphviz , graphviz
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
bzrtp bzrtp
cairo cairo
cyrus_sasl cyrus_sasl
ffmpeg_3 ffmpeg
gdk-pixbuf gdk-pixbuf
glib glib
gtk2 gtk2
@@ -4,7 +4,7 @@
, cmake , cmake
, doxygen , doxygen
, fetchFromGitLab , fetchFromGitLab
, ffmpeg_3 , ffmpeg
, glew , glew
, gsm , gsm
, intltool , intltool
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
alsaLib alsaLib
bctoolbox bctoolbox
bzrtp bzrtp
ffmpeg_3 ffmpeg
glew glew
gsm gsm
libGL libGL