From 0591cd607b3bcb2af298d978c1cedf8c5d9a1328 Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Sun, 26 Feb 2017 20:36:20 +0100 Subject: gst-plugins-good: align attrname with pkgname --- pkgs/applications/audio/banshee/default.nix | 4 ++-- pkgs/applications/audio/morituri/default.nix | 4 ++-- pkgs/applications/audio/quodlibet/default.nix | 6 +++--- pkgs/applications/audio/transcribe/default.nix | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'pkgs/applications/audio') diff --git a/pkgs/applications/audio/banshee/default.nix b/pkgs/applications/audio/banshee/default.nix index a8669dc957c..ca723e61e06 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 }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; 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 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 diff --git a/pkgs/applications/audio/morituri/default.nix b/pkgs/applications/audio/morituri/default.nix index 44d10957ca6..053c295be52 100644 --- a/pkgs/applications/audio/morituri/default.nix +++ b/pkgs/applications/audio/morituri/default.nix @@ -1,5 +1,5 @@ { 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 }: let @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ python cdparanoia cdrdao utillinux makeWrapper - gst_plugins_base gst_plugins_good + gst_plugins_base gst-plugins-good ] ++ pythonPath; patches = [ diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 1c6bd7783eb..f243d0c15ed 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -1,9 +1,9 @@ { 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-good != null || gst_plugins_ugly != null || gst_plugins_bad != null; @@ -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 2f1ebfb470a..50c022ec004 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 { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ gst_plugins_base gst_plugins_good + buildInputs = [ gst_plugins_base gst-plugins-good gst_plugins_bad gst_plugins_ugly gst-ffmpeg ]; dontPatchELF = true; -- cgit 1.4.1