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

gst-plugins-good: align attrname with pkgname

Browse Source
This commit is contained in:
Bjørn Forsman 2017-02-26 20:36:20 +01:00 committed by Robin Gloster
parent 4b2c7fe3d1
commit 0591cd607b
11 changed files with 24 additions and 23 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 }:
@ -17,7 +17,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

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

@ -1,5 +1,5 @@
{ stdenv, fetchgit, pythonPackages, cdparanoia, cdrdao { stdenv, fetchgit, pythonPackages, cdparanoia, cdrdao
, gst-python, gst_plugins_base, gst_plugins_good , gst-python, gst_plugins_base, gst-plugins-good
, utillinux, makeWrapper, substituteAll, autoreconfHook }: , utillinux, makeWrapper, substituteAll, autoreconfHook }:
let let
@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ buildInputs = [
python cdparanoia cdrdao utillinux makeWrapper python cdparanoia cdrdao utillinux makeWrapper
gst_plugins_base gst_plugins_good gst_plugins_base gst-plugins-good
] ++ pythonPath; ] ++ pythonPath;
patches = [ patches = [

6
pkgs/applications/audio/quodlibet/default.nix
View File

@ -1,9 +1,9 @@
{ stdenv, fetchurl, python2Packages, intltool { stdenv, fetchurl, python2Packages, intltool
, gst-python, withGstPlugins ? false, gst_plugins_base ? null , gst-python, withGstPlugins ? false, gst_plugins_base ? null
, gst_plugins_good ? null, gst_plugins_ugly ? null, gst_plugins_bad ? null }: , gst-plugins-good ? null, gst_plugins_ugly ? null, gst_plugins_bad ? null }:
assert withGstPlugins -> gst_plugins_base != null assert withGstPlugins -> gst_plugins_base != null
|| gst_plugins_good != null || gst-plugins-good != null
|| gst_plugins_ugly != null || gst_plugins_ugly != null
|| gst_plugins_bad != null; || gst_plugins_bad != null;
@ -44,7 +44,7 @@ in buildPythonApplication {
patches = [ ./quodlibet-package-plugins.patch ]; patches = [ ./quodlibet-package-plugins.patch ];
buildInputs = stdenv.lib.optionals withGstPlugins [ buildInputs = stdenv.lib.optionals withGstPlugins [
gst_plugins_base gst_plugins_good gst_plugins_ugly gst_plugins_bad gst_plugins_base gst-plugins-good gst_plugins_ugly gst_plugins_bad
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [

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

@ -1,6 +1,6 @@
{ 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 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -21,7 +21,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,6 +1,6 @@
{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
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -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/desktops/xfce/applications/xfce4-mixer.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, intltool, makeWrapper { stdenv, fetchurl, pkgconfig, intltool, makeWrapper
, glib, gstreamer, gst_plugins_base, gtk , glib, gstreamer, gst_plugins_base, gtk
, libxfce4util, libxfce4ui, xfce4panel, xfconf, libunique ? null , libxfce4util, libxfce4ui, xfce4panel, xfconf, libunique ? null
, pulseaudioSupport ? false, gst_plugins_good , pulseaudioSupport ? false, gst-plugins-good
}: }:
let let
@ -10,7 +10,7 @@ let
gst_plugins_minimal = gst_plugins_base.override { gst_plugins_minimal = gst_plugins_base.override {
minimalDeps = true; minimalDeps = true;
}; };
gst_plugins_pulse = gst_plugins_good.override { gst_plugins_pulse = gst-plugins-good.override {
minimalDeps = true; minimalDeps = true;
}; };
gst_plugins = [ gst_plugins_minimal ] ++ stdenv.lib.optional pulseaudioSupport gst_plugins_pulse; gst_plugins = [ gst_plugins_minimal ] ++ stdenv.lib.optional pulseaudioSupport gst_plugins_pulse;

4
pkgs/tools/networking/uget/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, openssl, curl, libnotify, gstreamer, { stdenv, fetchurl, pkgconfig, intltool, openssl, curl, libnotify, gstreamer,
gst_plugins_base, gst_plugins_good, gnome3, makeWrapper, aria2 ? null }: gst_plugins_base, gst-plugins-good, gnome3, makeWrapper, aria2 ? null }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "uget-${version}"; name = "uget-${version}";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool makeWrapper ]; nativeBuildInputs = [ pkgconfig intltool makeWrapper ];
buildInputs = [ buildInputs = [
openssl curl libnotify gstreamer gst_plugins_base gst_plugins_good openssl curl libnotify gstreamer gst_plugins_base gst-plugins-good
gnome3.gtk gnome3.dconf gnome3.gtk gnome3.dconf
] ]
++ (stdenv.lib.optional (aria2 != null) aria2); ++ (stdenv.lib.optional (aria2 != null) aria2);

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

@ -53,6 +53,7 @@ doNotDisplayTwice rec {
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_ffmpeg = gst-ffmpeg; # added 2017-02
gst_plugins_good = gst-plugins-good; # 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

8
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;
@ -7521,14 +7521,14 @@ with pkgs;
inherit (pkgs) gstreamer gnonlin gst-python qt_gstreamer; inherit (pkgs) gstreamer gnonlin gst-python qt_gstreamer;
gstPluginsBase = pkgs.gst_plugins_base; gstPluginsBase = pkgs.gst_plugins_base;
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;
gst-plugins-bad = pkgs.gst_plugins_bad; gst-plugins-bad = pkgs.gst_plugins_bad;
gst-plugins-good = pkgs.gst_plugins_good; gst-plugins-good = pkgs.gst-plugins-good;
gst-plugins-ugly = pkgs.gst_plugins_ugly; gst-plugins-ugly = pkgs.gst_plugins_ugly;
gst-ffmpeg = pkgs.gst-ffmpeg; gst-ffmpeg = pkgs.gst-ffmpeg;
}; };
@ -7541,7 +7541,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) ApplicationServices; inherit (darwin.apple_sdk.frameworks) ApplicationServices;
}; };
gst_plugins_good = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-good {}; gst-plugins-good = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-good {};
gst_plugins_bad = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-bad {}; gst_plugins_bad = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-bad {};