From 1ea4146f66b7751f3bbabc351b18d37f0228a241 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 26 Feb 2017 20:36:54 +0100 Subject: [PATCH] gst-plugins-bad: align attrname with pkgname --- pkgs/applications/audio/banshee/default.nix | 4 ++-- pkgs/applications/audio/quodlibet/default.nix | 6 +++--- pkgs/applications/audio/transcribe/default.nix | 4 ++-- .../networking/instant-messengers/baresip/default.nix | 4 ++-- .../networking/instant-messengers/gajim/default.nix | 6 +++--- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 8 ++++---- 7 files changed, 17 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/audio/banshee/default.nix b/pkgs/applications/audio/banshee/default.nix index ca723e61e06a..a1f00ace174e 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/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index f243d0c15ed2..ff151eca1497 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python2Packages, intltool , 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 || gst-plugins-good != null || gst_plugins_ugly != null - || gst_plugins_bad != null; + || gst-plugins-bad != null; let version = "2.6.3"; @@ -44,7 +44,7 @@ in buildPythonApplication { patches = [ ./quodlibet-package-plugins.patch ]; 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 = [ diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix index 50c022ec0045..8bd07df063da 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 eb8aff405285..a7ddfd1ae418 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/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index d78bd759ea6e..ae318e644243 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -4,7 +4,7 @@ # Test requirements , xvfb_run -, enableJingle ? true, farstream ? null, gst_plugins_bad ? null +, enableJingle ? true, farstream ? null, gst-plugins-bad ? null , libnice ? null , enableE2E ? true , enableRST ? true @@ -14,7 +14,7 @@ , extraPythonPackages ? pkgs: [] }: -assert enableJingle -> farstream != null && gst_plugins_bad != null +assert enableJingle -> farstream != null && gst-plugins-bad != null && libnice != null; assert enableE2E -> pythonPackages.pycrypto != null; assert enableRST -> pythonPackages.docutils != null; @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { buildInputs = [ python libX11 - ] ++ optionals enableJingle [ farstream gst_plugins_bad libnice ]; + ] ++ optionals enableJingle [ farstream gst-plugins-bad libnice ]; nativeBuildInputs = [ autoreconfHook pythonPackages.wrapPython intltool pkgconfig diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 630053463f66..2518bff1d78b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -54,6 +54,7 @@ doNotDisplayTwice rec { grantlee5 = qt5.grantlee; # added 2015-12-19 gst_ffmpeg = gst-ffmpeg; # 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 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 57b17b46f11b..e21f413f1d0e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7520,14 +7520,14 @@ with pkgs; gst_all = { inherit (pkgs) gstreamer gnonlin gst-python qt_gstreamer; gstPluginsBase = pkgs.gst_plugins_base; - gstPluginsBad = pkgs.gst_plugins_bad; + gstPluginsBad = pkgs.gst-plugins-bad; gstPluginsGood = pkgs.gst-plugins-good; gstPluginsUgly = pkgs.gst_plugins_ugly; gstFfmpeg = pkgs.gst-ffmpeg; # aliases with the dashed naming, same as in gst_all_1 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-ugly = pkgs.gst_plugins_ugly; gst-ffmpeg = pkgs.gst-ffmpeg; @@ -7543,7 +7543,7 @@ with pkgs; 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 {}; @@ -14922,7 +14922,7 @@ with pkgs; quodlibet = callPackage ../applications/audio/quodlibet { withGstPlugins = true; - gst_plugins_bad = null; + gst-plugins-bad = null; }; qutebrowser = qt5.callPackage ../applications/networking/browsers/qutebrowser {