From 6b73e57e561ad5da21cd93b82674a5249ee6a391 Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Sun, 26 Feb 2017 20:37:41 +0100 Subject: gst-plugins-ugly: 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 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 8 ++++---- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/audio/banshee/default.nix b/pkgs/applications/audio/banshee/default.nix index a1f00ace174e..1907d621e49f 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 ff151eca1497..2d97ba1d7639 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -1,10 +1,10 @@ { 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-ugly != null || gst-plugins-bad != null; let @@ -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 8bd07df063da..3eca141ee62f 100644 --- a/pkgs/applications/audio/transcribe/default.nix +++ b/pkgs/applications/audio/transcribe/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip, lib, makeWrapper, alsaLib, atk, cairo, gdk_pixbuf , 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 }: stdenv.mkDerivation rec { @@ -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/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2518bff1d78b..3ed1a721af5a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -55,6 +55,7 @@ doNotDisplayTwice rec { 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_plugins_ugly = gst-plugins-ugly; # 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 e21f413f1d0e..80127160a216 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; @@ -7522,14 +7522,14 @@ with pkgs; gstPluginsBase = pkgs.gst_plugins_base; gstPluginsBad = pkgs.gst-plugins-bad; gstPluginsGood = pkgs.gst-plugins-good; - gstPluginsUgly = pkgs.gst_plugins_ugly; + 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-good = pkgs.gst-plugins-good; - gst-plugins-ugly = pkgs.gst_plugins_ugly; + gst-plugins-ugly = pkgs.gst-plugins-ugly; gst-ffmpeg = pkgs.gst-ffmpeg; }; @@ -7545,7 +7545,7 @@ with pkgs; 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 {}; gst-ffmpeg = callPackage ../development/libraries/gstreamer/legacy/gst-ffmpeg { ffmpeg = ffmpeg_0; -- cgit 1.4.1