public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gst-ffmpeg: align attrname with pkgname

Browse Source
This commit is contained in:
Bjørn Forsman 2017-02-26 20:31:29 +01:00 committed by Robin Gloster
parent 9e21b2c5e9
commit 4b2c7fe3d1
7 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/banshee/default.nix
View File

@ -1,5 +1,5 @@
{ pkgs, stdenv, lib, fetchurl, intltool, pkgconfig, gstreamer, gst_plugins_base { 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 , 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 , boo, gdata-sharp, taglib-sharp, sqlite, gnome-sharp, gconf, gtk-sharp-beans, gio-sharp
, libmtp, libgpod, mono-zeroconf }: , libmtp, libgpod, mono-zeroconf }:
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [ buildInputs = [
gtk-sharp-2_0.gtk gstreamer gst_plugins_base gst_plugins_good 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 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 gtk-sharp-2_0 boo gdata-sharp taglib-sharp sqlite gnome-sharp gconf gtk-sharp-beans
gio-sharp libmtp libgpod mono-zeroconf gio-sharp libmtp libgpod mono-zeroconf

4
pkgs/applications/audio/transcribe/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchzip, lib, makeWrapper, alsaLib, atk, cairo, gdk_pixbuf { 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 , gst_plugins_good, gst_plugins_ugly, gstreamer, gtk2, libSM, libX11
, libpng12, pango, zlib }: , libpng12, pango, zlib }:
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ gst_plugins_base gst_plugins_good 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; dontPatchELF = true;

4
pkgs/applications/networking/instant-messengers/baresip/default.nix
View File

@ -1,5 +1,5 @@
{stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig {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 , gst_plugins_good, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg
, gsm, speex, portaudio, spandsp, libuuid, ccache , gsm, speex, portaudio, spandsp, libuuid, ccache
}: }:
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0dhlgjkqn7jkd1pmdyid41c829clzmi5kczjdwxzh5ygn95lydjc"; sha256 = "0dhlgjkqn7jkd1pmdyid41c829clzmi5kczjdwxzh5ygn95lydjc";
}; };
buildInputs = [zlib openssl libre librem pkgconfig 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 alsaLib SDL libv4l celt libsndfile srtp ffmpeg gsm speex portaudio spandsp libuuid
ccache ccache
]; ];

4
pkgs/applications/video/miro/default.nix
View File

@ -2,7 +2,7 @@
, pythonPackages, pyrex096, ffmpeg, boost, glib, gtk2, webkitgtk2, libsoup , pythonPackages, pyrex096, ffmpeg, boost, glib, gtk2, webkitgtk2, libsoup
, taglib, sqlite , taglib, sqlite
, libtorrentRasterbar, glib_networking, gsettings_desktop_schemas , 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 , enableBonjour ? false, avahi ? null
}: }:
@ -77,7 +77,7 @@ in buildPythonApplication rec {
propagatedBuildInputs = with pythonPackages; [ propagatedBuildInputs = with pythonPackages; [
pygobject2 pygtk pycurl mutagen pycairo dbus-python pygobject2 pygtk pycurl mutagen pycairo dbus-python
pywebkitgtk] ++ [ libtorrentRasterbar 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; ] ++ optional enableBonjour avahi;
meta = { meta = {

4
pkgs/tools/security/tor/torbrowser.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeDesktopItem { stdenv, fetchurl, makeDesktopItem
, libXrender, libX11, libXext, libXt, alsaLib, dbus, dbus_glib, glib, gtk2 , libXrender, libX11, libXext, libXt, alsaLib, dbus, dbus_glib, glib, gtk2
, atk, pango, freetype, fontconfig, gdk_pixbuf, cairo, zlib , 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 , libpulseaudio
, mediaSupport ? false , mediaSupport ? false
}: }:
@ -16,7 +16,7 @@ let
]); ]);
# Ignored if !mediaSupport # 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: gstPluginsPath = stdenv.lib.concatMapStringsSep ":" (x:
"${x}/lib/gstreamer-0.10") gstPlugins; "${x}/lib/gstreamer-0.10") gstPlugins;

1
pkgs/top-level/aliases.nix
View File

@ -52,6 +52,7 @@ doNotDisplayTwice rec {
git-hub = gitAndTools.git-hub; # added 2016-04-29 git-hub = gitAndTools.git-hub; # added 2016-04-29
googleAuthenticator = google-authenticator; # added 2016-10-16 googleAuthenticator = google-authenticator; # added 2016-10-16
grantlee5 = qt5.grantlee; # added 2015-12-19 grantlee5 = qt5.grantlee; # added 2015-12-19
gst_ffmpeg = gst-ffmpeg; # added 2017-02
gst_python = gst-python; # added 2017-02 gst_python = gst-python; # added 2017-02
gupnptools = gupnp-tools; # added 2015-12-19 gupnptools = gupnp-tools; # added 2015-12-19
gnustep-make = gnustep.make; # added 2016-7-6 gnustep-make = gnustep.make; # added 2016-7-6

6
pkgs/top-level/all-packages.nix
View File

@ -1151,7 +1151,7 @@ with pkgs;
clementine = callPackage ../applications/audio/clementine { clementine = callPackage ../applications/audio/clementine {
boost = boost155; 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; clementineFree = clementine.free;
@ -7523,7 +7523,7 @@ with pkgs;
gstPluginsBad = pkgs.gst_plugins_bad; gstPluginsBad = pkgs.gst_plugins_bad;
gstPluginsGood = pkgs.gst_plugins_good; gstPluginsGood = pkgs.gst_plugins_good;
gstPluginsUgly = pkgs.gst_plugins_ugly; gstPluginsUgly = pkgs.gst_plugins_ugly;
gstFfmpeg = pkgs.gst_ffmpeg; gstFfmpeg = pkgs.gst-ffmpeg;
# aliases with the dashed naming, same as in gst_all_1 # aliases with the dashed naming, same as in gst_all_1
gst-plugins-base = pkgs.gst_plugins_base; 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_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; ffmpeg = ffmpeg_0;
}; };