From 4b2c7fe3d1c6f46d5829db0e4b9dab1bdbfd8c1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 26 Feb 2017 20:31:29 +0100 Subject: [PATCH] gst-ffmpeg: align attrname with pkgname --- pkgs/applications/audio/banshee/default.nix | 4 ++-- pkgs/applications/audio/transcribe/default.nix | 4 ++-- .../networking/instant-messengers/baresip/default.nix | 4 ++-- pkgs/applications/video/miro/default.nix | 4 ++-- pkgs/tools/security/tor/torbrowser.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 6 +++--- 7 files changed, 14 insertions(+), 13 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 = { diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index 490864ee2d59..1073fd1cbad2 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeDesktopItem , libXrender, libX11, libXext, libXt, alsaLib, dbus, dbus_glib, glib, gtk2 , atk, pango, freetype, fontconfig, gdk_pixbuf, cairo, zlib -, gstreamer, gst_plugins_base, gst_plugins_good, gst_ffmpeg, gmp, ffmpeg +, gstreamer, gst_plugins_base, gst_plugins_good, gst-ffmpeg, gmp, ffmpeg , libpulseaudio , mediaSupport ? false }: @@ -16,7 +16,7 @@ let ]); # Ignored if !mediaSupport - gstPlugins = [ gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg ]; + gstPlugins = [ gstreamer gst_plugins_base gst_plugins_good gst-ffmpeg ]; gstPluginsPath = stdenv.lib.concatMapStringsSep ":" (x: "${x}/lib/gstreamer-0.10") gstPlugins; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 97a93c17ac43..759d92cd05f8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -52,6 +52,7 @@ doNotDisplayTwice rec { git-hub = gitAndTools.git-hub; # added 2016-04-29 googleAuthenticator = google-authenticator; # added 2016-10-16 grantlee5 = qt5.grantlee; # added 2015-12-19 + gst_ffmpeg = gst-ffmpeg; # added 2017-02 gst_python = gst-python; # added 2017-02 gupnptools = gupnp-tools; # added 2015-12-19 gnustep-make = gnustep.make; # added 2016-7-6 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bdc712153763..6ff7cb0beba3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1151,7 +1151,7 @@ with pkgs; clementine = callPackage ../applications/audio/clementine { boost = boost155; - gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_ugly gst_ffmpeg ]; + gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_ugly gst-ffmpeg ]; }; clementineFree = clementine.free; @@ -7523,7 +7523,7 @@ with pkgs; gstPluginsBad = pkgs.gst_plugins_bad; gstPluginsGood = pkgs.gst_plugins_good; gstPluginsUgly = pkgs.gst_plugins_ugly; - gstFfmpeg = pkgs.gst_ffmpeg; + gstFfmpeg = pkgs.gst-ffmpeg; # aliases with the dashed naming, same as in gst_all_1 gst-plugins-base = pkgs.gst_plugins_base; @@ -7547,7 +7547,7 @@ with pkgs; gst_plugins_ugly = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-ugly {}; - gst_ffmpeg = callPackage ../development/libraries/gstreamer/legacy/gst-ffmpeg { + gst-ffmpeg = callPackage ../development/libraries/gstreamer/legacy/gst-ffmpeg { ffmpeg = ffmpeg_0; };