dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

gst-plugins-bad: align attrname with pkgname

Browse Source
This commit is contained in:
Bjørn Forsman 2017-02-26 20:36:54 +01:00 committed by Robin Gloster
parent 0591cd607b
commit 1ea4146f66
7 changed files with 17 additions and 16 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

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

@ -1,11 +1,11 @@
{ 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;
let let
version = "2.6.3"; version = "2.6.3";
@ -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,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
]; ];

6
pkgs/applications/networking/instant-messengers/gajim/default.nix
View File

@ -4,7 +4,7 @@
# Test requirements # Test requirements
, xvfb_run , xvfb_run
, enableJingle ? true, farstream ? null, gst_plugins_bad ? null , enableJingle ? true, farstream ? null, gst-plugins-bad ? null
, libnice ? null , libnice ? null
, enableE2E ? true , enableE2E ? true
, enableRST ? true , enableRST ? true
@ -14,7 +14,7 @@
, extraPythonPackages ? pkgs: [] , extraPythonPackages ? pkgs: []
}: }:
assert enableJingle -> farstream != null && gst_plugins_bad != null assert enableJingle -> farstream != null && gst-plugins-bad != null
&& libnice != null; && libnice != null;
assert enableE2E -> pythonPackages.pycrypto != null; assert enableE2E -> pythonPackages.pycrypto != null;
assert enableRST -> pythonPackages.docutils != null; assert enableRST -> pythonPackages.docutils != null;
@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
python libX11 python libX11
] ++ optionals enableJingle [ farstream gst_plugins_bad libnice ]; ] ++ optionals enableJingle [ farstream gst-plugins-bad libnice ];
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook pythonPackages.wrapPython intltool pkgconfig autoreconfHook pythonPackages.wrapPython intltool pkgconfig

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

@ -54,6 +54,7 @@ doNotDisplayTwice rec {
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_plugins_good = gst-plugins-good; # added 2017-02
gst_plugins_bad = gst-plugins-bad; # 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

@ -7520,14 +7520,14 @@ with pkgs;
gst_all = { gst_all = {
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;
@ -7543,7 +7543,7 @@ with pkgs;
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 {};
gst_plugins_ugly = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-ugly {}; gst_plugins_ugly = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-ugly {};
@ -14922,7 +14922,7 @@ with pkgs;
quodlibet = callPackage ../applications/audio/quodlibet { quodlibet = callPackage ../applications/audio/quodlibet {
withGstPlugins = true; withGstPlugins = true;
gst_plugins_bad = null; gst-plugins-bad = null;
}; };
qutebrowser = qt5.callPackage ../applications/networking/browsers/qutebrowser { qutebrowser = qt5.callPackage ../applications/networking/browsers/qutebrowser {