From 305bad4fcf35785e0bd00a7f121b912ffdb67a29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 17 May 2021 14:34:47 +0200 Subject: [PATCH 1/3] liblibphone: use ffmpeg instead of ffmpeg_3 --- pkgs/development/libraries/liblinphone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix index 3ef64823a024..e1c5e3f892b0 100644 --- a/pkgs/development/libraries/liblinphone/default.nix +++ b/pkgs/development/libraries/liblinphone/default.nix @@ -10,7 +10,7 @@ , cyrus_sasl , doxygen , fetchFromGitLab -, ffmpeg_3 +, ffmpeg , gdk-pixbuf , glib , graphviz @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { bzrtp cairo cyrus_sasl - ffmpeg_3 + ffmpeg gdk-pixbuf glib gtk2 From 6220405c9f4aaae07020bf672af6987e20ffe635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 17 May 2021 14:35:09 +0200 Subject: [PATCH 2/3] linphone: use ffmpeg instead of ffmpeg_3 --- .../networking/instant-messengers/linphone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index f0846fc63f7e..1c2df3924ecd 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -10,7 +10,7 @@ , cyrus_sasl , fetchFromGitLab , fetchurl -, ffmpeg_3 +, ffmpeg , gdk-pixbuf , glib , gnused @@ -87,7 +87,7 @@ mkDerivation rec { bzrtp cairo cyrus_sasl - ffmpeg_3 + ffmpeg gdk-pixbuf glib gtk2 From e581a5509415d3971aec4109ff770b8d9258db4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 20 May 2021 13:47:07 +0200 Subject: [PATCH 3/3] mediastreamer: use ffmpeg instead of ffmpeg_3 --- pkgs/development/libraries/mediastreamer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index aaa31b29e9ea..ea164dd481d3 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -4,7 +4,7 @@ , cmake , doxygen , fetchFromGitLab -, ffmpeg_3 +, ffmpeg , glew , gsm , intltool @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { alsaLib bctoolbox bzrtp - ffmpeg_3 + ffmpeg glew gsm libGL