about summary refs log tree commit diff
path: root/pkgs/applications/networking/instant-messengers
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2018-05-05 23:53:04 +0200
committerGitHub <noreply@github.com>2018-05-05 23:53:04 +0200
commit3be89545798ca12a8bf7f1312cb2fcd3399fdf69 (patch)
treee6765d4529ac8d2f27477c124cdee290ef92af46 /pkgs/applications/networking/instant-messengers
parent8cf420e62feb9bbd53a91e89a3a579becb41816a (diff)
parent841a5553cb411577b5421701b41530e0981d5d82 (diff)
downloadnixlib-3be89545798ca12a8bf7f1312cb2fcd3399fdf69.tar
nixlib-3be89545798ca12a8bf7f1312cb2fcd3399fdf69.tar.gz
nixlib-3be89545798ca12a8bf7f1312cb2fcd3399fdf69.tar.bz2
nixlib-3be89545798ca12a8bf7f1312cb2fcd3399fdf69.tar.lz
nixlib-3be89545798ca12a8bf7f1312cb2fcd3399fdf69.tar.xz
nixlib-3be89545798ca12a8bf7f1312cb2fcd3399fdf69.tar.zst
nixlib-3be89545798ca12a8bf7f1312cb2fcd3399fdf69.zip
Merge pull request #39985 from jtojnar/drop-legacy-gst
various: {upgrade,drop} GStreamer 0.10 dependency 
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
-rw-r--r--pkgs/applications/networking/instant-messengers/baresip/default.nix12
1 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index 538e9a3786be..eff33643ebcf 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -1,6 +1,5 @@
-{stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig
-, cairo, mpg123, gstreamer, gst-ffmpeg, gst-plugins-base, gst-plugins-bad
-, gst-plugins-good, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg
+{stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig, gst_all_1
+, cairo, mpg123, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg
 , gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx
 }:
 stdenv.mkDerivation rec {
@@ -11,11 +10,10 @@ stdenv.mkDerivation rec {
     sha256 = "02bf4fwirf3b7h3cr1jqm0xsjzza4fi9kg88424js2l0xywwzpgf";
   };
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [zlib openssl libre librem
-    cairo mpg123 gstreamer gst-ffmpeg gst-plugins-base gst-plugins-bad gst-plugins-good
+  buildInputs = [zlib openssl libre librem cairo mpg123
     alsaLib SDL libv4l celt libsndfile srtp ffmpeg gsm speex portaudio spandsp libuuid
     ccache libvpx
-    ];
+  ] ++ (with gst_all_1; [ gstreamer gst-libav gst-plugins-base gst-plugins-bad gst-plugins-good ]);
   makeFlags = [
     "LIBRE_MK=${libre}/share/re/re.mk"
     "LIBRE_INC=${libre}/include/re"
@@ -26,7 +24,7 @@ stdenv.mkDerivation rec {
     "CCACHE_DISABLE=1"
 
     "USE_ALSA=1" "USE_AMR=1" "USE_CAIRO=1" "USE_CELT=1"
-    "USE_CONS=1" "USE_EVDEV=1" "USE_FFMPEG=1"  "USE_GSM=1" "USE_GST=1"
+    "USE_CONS=1" "USE_EVDEV=1" "USE_FFMPEG=1"  "USE_GSM=1" "USE_GST1=1"
     "USE_L16=1" "USE_MPG123=1" "USE_OSS=1" "USE_PLC=1" "USE_VPX=1"
     "USE_PORTAUDIO=1" "USE_SDL=1" "USE_SNDFILE=1" "USE_SPEEX=1"
     "USE_SPEEX_AEC=1" "USE_SPEEX_PP=1" "USE_SPEEX_RESAMP=1" "USE_SRTP=1"