about summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2017-02-26 20:31:29 +0100
committerRobin Gloster <mail@glob.in>2017-02-27 12:16:26 +0100
commit4b2c7fe3d1c6f46d5829db0e4b9dab1bdbfd8c1b (patch)
tree348900e38c8fa77072dfa369c50b137b77f20841 /pkgs/applications
parent9e21b2c5e99a76379d5993b88f2de645ab2a390c (diff)
downloadnixlib-4b2c7fe3d1c6f46d5829db0e4b9dab1bdbfd8c1b.tar
nixlib-4b2c7fe3d1c6f46d5829db0e4b9dab1bdbfd8c1b.tar.gz
nixlib-4b2c7fe3d1c6f46d5829db0e4b9dab1bdbfd8c1b.tar.bz2
nixlib-4b2c7fe3d1c6f46d5829db0e4b9dab1bdbfd8c1b.tar.lz
nixlib-4b2c7fe3d1c6f46d5829db0e4b9dab1bdbfd8c1b.tar.xz
nixlib-4b2c7fe3d1c6f46d5829db0e4b9dab1bdbfd8c1b.tar.zst
nixlib-4b2c7fe3d1c6f46d5829db0e4b9dab1bdbfd8c1b.zip
gst-ffmpeg: align attrname with pkgname
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/audio/banshee/default.nix4
-rw-r--r--pkgs/applications/audio/transcribe/default.nix4
-rw-r--r--pkgs/applications/networking/instant-messengers/baresip/default.nix4
-rw-r--r--pkgs/applications/video/miro/default.nix4
4 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/applications/audio/banshee/default.nix b/pkgs/applications/audio/banshee/default.nix
index 4e5086bdb26d..a8669dc957c9 100644
--- a/pkgs/applications/audio/banshee/default.nix
+++ b/pkgs/applications/audio/banshee/default.nix
@@ -1,5 +1,5 @@
 { pkgs, stdenv, lib, fetchurl, intltool, pkgconfig, gstreamer, gst_plugins_base
-, gst_plugins_good, gst_plugins_bad, gst_plugins_ugly, gst_ffmpeg, glib
+, gst_plugins_good, gst_plugins_bad, gst_plugins_ugly, gst-ffmpeg, glib
 , mono, mono-addins, dbus-sharp-1_0, dbus-sharp-glib-1_0, notify-sharp, gtk-sharp-2_0
 , boo, gdata-sharp, taglib-sharp, sqlite, gnome-sharp, gconf, gtk-sharp-beans, gio-sharp
 , libmtp, libgpod, mono-zeroconf }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig intltool ];
   buildInputs = [
     gtk-sharp-2_0.gtk gstreamer gst_plugins_base gst_plugins_good
-    gst_plugins_bad gst_plugins_ugly gst_ffmpeg
+    gst_plugins_bad gst_plugins_ugly gst-ffmpeg
     mono dbus-sharp-1_0 dbus-sharp-glib-1_0 mono-addins notify-sharp
     gtk-sharp-2_0 boo gdata-sharp taglib-sharp sqlite gnome-sharp gconf gtk-sharp-beans
     gio-sharp libmtp libgpod mono-zeroconf
diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix
index 55e4b8e00b65..2f1ebfb470ad 100644
--- a/pkgs/applications/audio/transcribe/default.nix
+++ b/pkgs/applications/audio/transcribe/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchzip, lib, makeWrapper, alsaLib, atk, cairo, gdk_pixbuf
-, glib, gst_ffmpeg, gst_plugins_bad, gst_plugins_base
+, glib, gst-ffmpeg, gst_plugins_bad, gst_plugins_base
 , gst_plugins_good, gst_plugins_ugly, gstreamer, gtk2, libSM, libX11
 , libpng12, pango, zlib }:
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper ];
 
   buildInputs = [ gst_plugins_base gst_plugins_good
-    gst_plugins_bad gst_plugins_ugly gst_ffmpeg ];
+    gst_plugins_bad gst_plugins_ugly gst-ffmpeg ];
 
   dontPatchELF = true;
 
diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index 3ce638e6b58a..0ed65b72bfa0 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -1,5 +1,5 @@
 {stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig
-, cairo, mpg123, gstreamer, gst_ffmpeg, gst_plugins_base, gst_plugins_bad
+, cairo, mpg123, gstreamer, gst-ffmpeg, gst_plugins_base, gst_plugins_bad
 , gst_plugins_good, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg
 , gsm, speex, portaudio, spandsp, libuuid, ccache
 }:
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0dhlgjkqn7jkd1pmdyid41c829clzmi5kczjdwxzh5ygn95lydjc";
   };
   buildInputs = [zlib openssl libre librem pkgconfig
-    cairo mpg123 gstreamer gst_ffmpeg gst_plugins_base gst_plugins_bad gst_plugins_good
+    cairo mpg123 gstreamer gst-ffmpeg gst_plugins_base gst_plugins_bad gst_plugins_good
     alsaLib SDL libv4l celt libsndfile srtp ffmpeg gsm speex portaudio spandsp libuuid
     ccache
     ];
diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix
index b0a793dc1056..443726ecb853 100644
--- a/pkgs/applications/video/miro/default.nix
+++ b/pkgs/applications/video/miro/default.nix
@@ -2,7 +2,7 @@
 , pythonPackages, pyrex096, ffmpeg, boost, glib, gtk2, webkitgtk2, libsoup
 , taglib, sqlite
 , libtorrentRasterbar, glib_networking, gsettings_desktop_schemas
-, gst-python, gst_plugins_base, gst_plugins_good, gst_ffmpeg
+, gst-python, gst_plugins_base, gst_plugins_good, gst-ffmpeg
 , enableBonjour ? false, avahi ? null
 }:
 
@@ -77,7 +77,7 @@ in buildPythonApplication rec {
   propagatedBuildInputs = with pythonPackages; [
     pygobject2 pygtk pycurl mutagen pycairo dbus-python
     pywebkitgtk] ++ [ libtorrentRasterbar
-    gst-python gst_plugins_base gst_plugins_good gst_ffmpeg
+    gst-python gst_plugins_base gst_plugins_good gst-ffmpeg
   ] ++ optional enableBonjour avahi;
 
   meta = {