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

gst-plugins-ugly: align attrname with pkgname

This commit is contained in:
Bjørn Forsman 2017-02-26 20:37:41 +01:00 committed by Robin Gloster
parent 1ea4146f66
commit 6b73e57e56
5 changed files with 12 additions and 11 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,10 +1,10 @@
{ 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
@ -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 {
@ -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;

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

@ -55,6 +55,7 @@ doNotDisplayTwice rec {
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_plugins_bad = gst-plugins-bad; # added 2017-02
gst_plugins_ugly = gst-plugins-ugly; # 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;
@ -7522,14 +7522,14 @@ with pkgs;
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;
}; };
@ -7545,7 +7545,7 @@ with pkgs;
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 {};
gst-ffmpeg = callPackage ../development/libraries/gstreamer/legacy/gst-ffmpeg { gst-ffmpeg = callPackage ../development/libraries/gstreamer/legacy/gst-ffmpeg {
ffmpeg = ffmpeg_0; ffmpeg = ffmpeg_0;