gst-plugins-base: align attrname with pkgname

This commit is contained in:
Bjørn Forsman 2017-02-26 21:25:29 +01:00 committed by Robin Gloster
parent c49533a494
commit 3d104ab2b3
40 changed files with 88 additions and 87 deletions

View File

@ -1,4 +1,4 @@
{ 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
, 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
@ -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

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, boost, cmake, gettext, gstreamer, gst_plugins_base
{ stdenv, fetchurl, boost, cmake, gettext, gstreamer, gst-plugins-base
, liblastfm, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist
, usbmuxd, libmtp, gvfs, libcdio, libspotify, protobuf, qca2, pkgconfig
, sparsehash, config, makeWrapper, runCommand, gst_plugins }:
@ -27,7 +27,7 @@ let
fftw
gettext
glew
gst_plugins_base
gst-plugins-base
gstreamer
gvfs
libcdio

View File

@ -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 = [

View File

@ -1,8 +1,8 @@
{ 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 }:
assert withGstPlugins -> gst_plugins_base != null
assert withGstPlugins -> gst-plugins-base != 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 = [

View File

@ -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 }:
@ -21,14 +21,14 @@ 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;
libPath = lib.makeLibraryPath [
stdenv.cc.cc glib gtk2 atk pango cairo gdk_pixbuf alsaLib
libX11 libSM libpng12 gstreamer gst_plugins_base zlib
libX11 libSM libpng12 gstreamer gst-plugins-base zlib
];
installPhase = ''

View File

@ -12,7 +12,7 @@
, gdk_pixbuf
, glib
, glibc
, gst_plugins_base
, gst-plugins-base
, gstreamer
, gtk2
, gtk3
@ -94,7 +94,7 @@ stdenv.mkDerivation {
gdk_pixbuf
glib
glibc
gst_plugins_base
gst-plugins-base
gstreamer
gtk2
gtk3

View File

@ -3,7 +3,7 @@
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
, yasm, mesa, sqlite, unzip, makeWrapper
, hunspell, libevent, libstartup_notification, libvpx
, cairo, gstreamer, gst_plugins_base, icu, libpng, jemalloc, libpulseaudio
, cairo, gstreamer, gst-plugins-base, icu, libpng, jemalloc, libpulseaudio
, autoconf213, which
, writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl
, enableGTK3 ? false
@ -42,7 +42,7 @@ common = { pname, version, sha512, updateScript }: stdenv.mkDerivation rec {
libpulseaudio # only headers are needed
]
++ lib.optional enableGTK3 gtk3
++ lib.optionals (!passthru.ffmpegSupport) [ gstreamer gst_plugins_base ];
++ lib.optionals (!passthru.ffmpegSupport) [ gstreamer gst-plugins-base ];
nativeBuildInputs = [ autoconf213 which gnused ];

View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, makeDesktopItem
, pkgconfig, autoconf213, alsaLib, bzip2, cairo
, dbus, dbus_glib, file, fontconfig, freetype
, gstreamer, gst_plugins_base, gst_all_1
, gstreamer, gst-plugins-base, gst_all_1
, gtk2, hunspell, icu, libevent, libjpeg, libnotify
, libstartup_notification, libvpx, makeWrapper, mesa
, nspr, nss, pango, perl, python, libpulseaudio, sqlite
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
buildInputs = [
alsaLib bzip2 cairo dbus dbus_glib file fontconfig freetype
gst_plugins_base gstreamer gst_all_1.gst-plugins-base gtk2
gst-plugins-base gstreamer gst_all_1.gst-plugins-base gtk2
hunspell icu libevent libjpeg libnotify libstartup_notification
libvpx makeWrapper mesa nspr nss pango perl pkgconfig python
libpulseaudio sqlite unzip which yasm zip zlib

View File

@ -3,7 +3,7 @@
, alsaLib, dbus_libs, cups, libexif, ffmpeg, systemd
, freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp
, libuuid, xz
, gstreamer, gst_plugins_base, libxml2
, gstreamer, gst-plugins-base, libxml2
, glib, gtk2, pango, gdk_pixbuf, cairo, atk, gnome3
, nss, nspr
, patchelf
@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
atk alsaLib dbus_libs cups gtk2 gdk_pixbuf libexif ffmpeg systemd
freetype fontconfig libXrender libuuid expat glib nss nspr
gstreamer libxml2 gst_plugins_base pango cairo gnome3.gconf
gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf
patchelf
];

View File

@ -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
];

View File

@ -2,7 +2,7 @@
, fetchurl
, gcc
, glib
, gst_plugins_base
, gst-plugins-base
, gstreamer
, icu
, libpulseaudio
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
alsaLib
gcc.cc
glib
gst_plugins_base
gst-plugins-base
gstreamer
icu
libpulseaudio

View File

@ -13,7 +13,7 @@
, gdk_pixbuf
, glib
, glibc
, gst_plugins_base
, gst-plugins-base
, gstreamer
, gtk2
, kerberos
@ -91,7 +91,7 @@ stdenv.mkDerivation {
gdk_pixbuf
glib
glibc
gst_plugins_base
gst-plugins-base
gstreamer
gtk2
kerberos

View File

@ -3,7 +3,7 @@
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
, yasm, mesa, sqlite, unzip, makeWrapper
, hunspell, libevent, libstartup_notification, libvpx
, cairo, gstreamer, gst_plugins_base, icu
, cairo, gstreamer, gst-plugins-base, icu
, writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl
, debugBuild ? false
, # If you want the resulting program to call itself "Thunderbird"

View File

@ -2,7 +2,7 @@
, pythonPackages, pyrex096, ffmpeg, boost, glib, gtk2, webkitgtk2, libsoup
, taglib, sqlite
, libtorrentRasterbar, glib_networking, gsettings_desktop_schemas
, gst-python, gst_plugins_base, gst-plugins-good, gst-ffmpeg
, gst-python, gst-plugins-base, gst-plugins-good, gst-ffmpeg
, enableBonjour ? false, avahi ? null
}:
@ -77,7 +77,7 @@ in buildPythonApplication rec {
propagatedBuildInputs = with pythonPackages; [
pygobject2 pygtk pycurl mutagen pycairo dbus-python
pywebkitgtk] ++ [ libtorrentRasterbar
gst-python gst_plugins_base gst-plugins-good gst-ffmpeg
gst-python gst-plugins-base gst-plugins-good gst-ffmpeg
] ++ optional enableBonjour avahi;
meta = {

View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper,
dbus_glib, libcanberra_gtk2, gst_all_1, vala_0_32, gnome3, gtk3, gst_plugins_base,
dbus_glib, libcanberra_gtk2, gst_all_1, vala_0_32, gnome3, gtk3, gst-plugins-base,
glib, gobjectIntrospection, telepathy_glib
}:

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, makeWrapper
, glib, gstreamer, gst_plugins_base, gtk
, glib, gstreamer, gst-plugins-base, gtk
, libxfce4util, libxfce4ui, xfce4panel, xfconf, libunique ? null
, pulseaudioSupport ? false, gst-plugins-good
}:
@ -7,7 +7,7 @@
let
# The usual Gstreamer plugins package has a zillion dependencies
# that we don't need for a simple mixer, so build a minimal package.
gst_plugins_minimal = gst_plugins_base.override {
gst_plugins_minimal = gst-plugins-base.override {
minimalDeps = true;
};
gst_plugins_pulse = gst-plugins-good.override {

View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, makeWrapper
, gstreamer, gtk2, gst_plugins_base, libnotify
, gstreamer, gtk2, gst-plugins-base, libnotify
, keybinder, xfconf
}:
let
# The usual Gstreamer plugins package has a zillion dependencies
# that we don't need for a simple mixer, so build a minimal package.
gst_plugins_minimal = gst_plugins_base.override {
gst_plugins_minimal = gst-plugins-base.override {
minimalDeps = true;
};

View File

@ -69335,7 +69335,7 @@ self: {
"gi-gstaudio" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
, gi-gobject, gi-gst, gi-gstbase, gobjectIntrospection
, gst_plugins_base, haskell-gi, haskell-gi-base, text, transformers
, gst-plugins-base, haskell-gi, haskell-gi-base, text, transformers
}:
mkDerivation {
pname = "gi-gstaudio";
@ -69347,18 +69347,18 @@ self: {
haskell-gi haskell-gi-base text transformers
];
librarySystemDepends = [ gobjectIntrospection ];
libraryPkgconfigDepends = [ gst_plugins_base ];
libraryPkgconfigDepends = [ gst-plugins-base ];
doHaddock = false;
homepage = "https://github.com/haskell-gi/haskell-gi";
description = "GStreamerAudio bindings";
license = stdenv.lib.licenses.lgpl21;
hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) gobjectIntrospection;
gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;};
gst-plugins-base = pkgs.gst_all_1.gst-plugins-base;};
"gi-gstbase" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
, gi-gobject, gi-gst, gobjectIntrospection, gst_plugins_base
, gi-gobject, gi-gst, gobjectIntrospection, gst-plugins-base
, haskell-gi, haskell-gi-base, text, transformers
}:
mkDerivation {
@ -69371,19 +69371,19 @@ self: {
haskell-gi-base text transformers
];
librarySystemDepends = [ gobjectIntrospection ];
libraryPkgconfigDepends = [ gst_plugins_base ];
libraryPkgconfigDepends = [ gst-plugins-base ];
doHaddock = false;
homepage = "https://github.com/haskell-gi/haskell-gi";
description = "GStreamerBase bindings";
license = stdenv.lib.licenses.lgpl21;
hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) gobjectIntrospection;
gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;};
gst-plugins-base = pkgs.gst_all_1.gst-plugins-base;};
"gi-gstvideo" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
, gi-gobject, gi-gst, gi-gstbase, gobjectIntrospection
, gst_plugins_base, haskell-gi, haskell-gi-base, text, transformers
, gst-plugins-base, haskell-gi, haskell-gi-base, text, transformers
}:
mkDerivation {
pname = "gi-gstvideo";
@ -69395,14 +69395,14 @@ self: {
haskell-gi haskell-gi-base text transformers
];
librarySystemDepends = [ gobjectIntrospection ];
libraryPkgconfigDepends = [ gst_plugins_base ];
libraryPkgconfigDepends = [ gst-plugins-base ];
doHaddock = false;
homepage = "https://github.com/haskell-gi/haskell-gi";
description = "GStreamerVideo bindings";
license = stdenv.lib.licenses.lgpl21;
hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) gobjectIntrospection;
gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;};
gst-plugins-base = pkgs.gst_all_1.gst-plugins-base;};
"gi-gtk" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
@ -76588,7 +76588,7 @@ self: {
"gstreamer" = callPackage
({ mkDerivation, array, base, bytestring, Cabal, directory, glib
, gst_plugins_base, gstreamer, gtk2hs-buildtools, mtl
, gst-plugins-base, gstreamer, gtk2hs-buildtools, mtl
}:
mkDerivation {
pname = "gstreamer";
@ -76598,11 +76598,11 @@ self: {
libraryHaskellDepends = [
array base bytestring directory glib mtl
];
libraryPkgconfigDepends = [ gst_plugins_base gstreamer ];
libraryPkgconfigDepends = [ gst-plugins-base gstreamer ];
homepage = "http://projects.haskell.org/gtk2hs/";
description = "Binding to the GStreamer open source multimedia framework";
license = stdenv.lib.licenses.lgpl21;
}) {inherit (pkgs) gst_plugins_base; inherit (pkgs) gstreamer;};
}) {inherit (pkgs) gst-plugins-base; inherit (pkgs) gstreamer;};
"gt-tools" = callPackage
({ mkDerivation, base, containers, extensible-exceptions, haskeline

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libnice, pkgconfig, python2Packages, gstreamer, gst_plugins_base
{ stdenv, fetchurl, libnice, pkgconfig, python2Packages, gstreamer, gst-plugins-base
, gst-python, gupnp_igd }:
let
@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ gstreamer gst_plugins_base ];
propagatedBuildInputs = [ gstreamer gst-plugins-base ];
meta = {
homepage = http://farsight.freedesktop.org/wiki/;

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gst_plugins_base, gstreamer }:
{ stdenv, fetchurl, pkgconfig, gst-plugins-base, gstreamer }:
stdenv.mkDerivation rec {
name = "gnonlin-0.10.17";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0dc9kvr6i7sh91cyhzlbx2bchwg84rfa4679ccppzjf0y65dv8p4";
};
buildInputs = [ gst_plugins_base gstreamer pkgconfig ];
buildInputs = [ gst-plugins-base gstreamer pkgconfig ];
meta = {
homepage = "http://gstreamer.freedesktop.org/modules/gnonlin.html";

View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, pkgconfig, gst_plugins_base, bzip2, yasm, orc
{ fetchurl, stdenv, pkgconfig, gst-plugins-base, bzip2, yasm, orc
, useInternalFfmpeg ? false, ffmpeg ? null }:
stdenv.mkDerivation rec {
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
configureFlags = stdenv.lib.optionalString (!useInternalFfmpeg) "--with-system-ffmpeg";
buildInputs =
[ pkgconfig bzip2 gst_plugins_base orc ]
[ pkgconfig bzip2 gst-plugins-base orc ]
++ (if useInternalFfmpeg then [ yasm ] else [ ffmpeg ]);
meta = {

View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gst_plugins_base
{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gst-plugins-base
, libdvdnav, libdvdread, orc }:
stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ pkgconfig glib gstreamer gst_plugins_base libdvdnav libdvdread orc ];
[ pkgconfig glib gstreamer gst-plugins-base libdvdnav libdvdread orc ];
enableParallelBuilding = true;

View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, lib, pkgconfig, gst_plugins_base, aalib, cairo
{ fetchurl, stdenv, lib, pkgconfig, gst-plugins-base, aalib, cairo
, flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx
, libiec61883, libavc1394, taglib, libpulseaudio, gdk_pixbuf, orc
, glib, gstreamer, bzip2, libsoup, libshout, ncurses, libintlOrEmpty
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--enable-experimental" "--disable-oss" ];
buildInputs =
[ pkgconfig glib gstreamer gst_plugins_base ]
[ pkgconfig glib gstreamer gst-plugins-base ]
++ lib.optional stdenv.isLinux libpulseaudio
++ libintlOrEmpty
++ lib.optionals (!minimalDeps)

View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gst_plugins_base
{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gst-plugins-base
, libmad, libdvdread, libmpeg2, libcdio, a52dec, x264, orc, lame, libintlOrEmpty }:
stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ pkgconfig glib gstreamer gst_plugins_base libmad libdvdread a52dec x264 orc lame ] ++ libintlOrEmpty;
[ pkgconfig glib gstreamer gst-plugins-base libmad libdvdread a52dec x264 orc lame ] ++ libintlOrEmpty;
NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;

View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, pkgconfig, python2Packages, gstreamer, gst_plugins_base
{ fetchurl, stdenv, pkgconfig, python2Packages, gstreamer, gst-plugins-base
}:
let
@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
patches = [ ./disable-testFake.patch ];
buildInputs =
[ pkgconfig gst_plugins_base pygobject2 ]
[ pkgconfig gst-plugins-base pygobject2 ]
;
propagatedBuildInputs = [ gstreamer python ];

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, glibmm, gstreamer, gst_plugins_base, libsigcxx, libxmlxx, pkgconfig }:
{ stdenv, fetchurl, glibmm, gstreamer, gst-plugins-base, libsigcxx, libxmlxx, pkgconfig }:
let
ver_maj = "0.10";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
doCheck = false; # Tests require pulseaudio in /homeless-shelter
propagatedBuildInputs = [
glibmm gstreamer gst_plugins_base libsigcxx libxmlxx
glibmm gstreamer gst-plugins-base libsigcxx libxmlxx
];
nativeBuildInputs = [ pkgconfig ];

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gstreamer, gst_plugins_base, boost, glib, qt4, cmake
{ stdenv, fetchurl, gstreamer, gst-plugins-base, boost, glib, qt4, cmake
, automoc4, flex, bison, pkgconfig }:
stdenv.mkDerivation rec {
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1pqg9sxzk8sdrf7pazb5v21hasqai9i4l203gbdqz29w2ll1ybsl";
};
buildInputs = [ gstreamer gst_plugins_base glib qt4 ];
buildInputs = [ gstreamer gst-plugins-base glib qt4 ];
propagatedBuildInputs = [ boost ];
nativeBuildInputs = [ cmake automoc4 flex bison pkgconfig ];

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, libtool, gtk ? null, libcap
, alsaLib, libpulseaudio, gstreamer, gst_plugins_base, libvorbis }:
, alsaLib, libpulseaudio, gstreamer, gst-plugins-base, libvorbis }:
stdenv.mkDerivation rec {
name = "libcanberra-0.30";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [
pkgconfig libtool alsaLib libpulseaudio libvorbis gtk libcap
/*gstreamer gst_plugins_base*/ # ToDo: gstreamer not found (why?), add (g)udev?
/*gstreamer gst-plugins-base*/ # ToDo: gstreamer not found (why?), add (g)udev?
];
configureFlags = "--disable-oss";

View File

@ -3,7 +3,7 @@
, libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng
, libmng, which, mesaSupported, mesa, mesa_glu, openssl, dbus, cups, pkgconfig
, libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi
, buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst_plugins_base
, buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst-plugins-base
, buildWebkit ? (stdenv.isLinux || stdenv.isDarwin)
, flashplayerFix ? false, gdk_pixbuf
, gtkStyle ? false, libgnomeui, gtk2, GConf, gnome_vfs
@ -138,7 +138,7 @@ stdenv.mkDerivation rec {
# Qt doesn't directly need GLU (just GL), but many apps use, it's small and doesn't remain a runtime-dep if not used
++ optional mesaSupported mesa_glu
++ optional ((buildWebkit || buildMultimedia) && stdenv.isLinux ) alsaLib
++ optionals (buildWebkit || buildMultimedia) [ gstreamer gst_plugins_base ];
++ optionals (buildWebkit || buildMultimedia) [ gstreamer gst-plugins-base ];
# The following libraries are only used in plugins
buildInputs =

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
, gstreamer, gst_plugins_base, GConf, libX11, cairo
, gstreamer, gst-plugins-base, GConf, libX11, cairo
, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true,
}:
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz";
};
buildInputs = [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf libX11 cairo ]
buildInputs = [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf libX11 cairo ]
++ optional withMesa mesa;
nativeBuildInputs = [ pkgconfig ];

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
, gstreamer, gst_plugins_base, GConf, setfile
, gstreamer, gst-plugins-base, GConf, setfile
, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true
, Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null
}:
@ -21,7 +21,7 @@ stdenv.mkDerivation {
buildInputs =
[ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer
gst_plugins_base GConf ]
gst-plugins-base GConf ]
++ optional withMesa mesa
++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ];

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm
, xf86vidmodeproto , gstreamer, gst_plugins_base, GConf, setfile
, xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, setfile
, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true
, withWebKit ? false, webkitgtk2 ? null
, AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null
@ -24,7 +24,7 @@ stdenv.mkDerivation {
buildInputs =
[ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer
gst_plugins_base GConf ]
gst-plugins-base GConf ]
++ optional withMesa mesa
++ optional withWebKit webkitgtk2
++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];

View File

@ -78,7 +78,7 @@ let
SDL2_ttf
SDL2_mixer
gstreamer
gst_plugins_base
gst-plugins-base
] ++ lib.optional (!newStdcpp) gcc48.cc;
overridePkgs = with pkgs; [

View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
readline libsndfile udev libical
# Disables GStreamer; not clear what it gains us other than a
# zillion extra dependencies.
# gstreamer gst_plugins_base
# gstreamer gst-plugins-base
];
outputs = [ "out" "dev" "test" ];

View File

@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
readline libsndfile udev libical
# Disables GStreamer; not clear what it gains us other than a
# zillion extra dependencies.
# gstreamer gst_plugins_base
# gstreamer gst-plugins-base
];
preConfigure = ''

View File

@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
readline libsndfile
# Disables GStreamer; not clear what it gains us other than a
# zillion extra dependencies.
# gstreamer gst_plugins_base
# gstreamer gst-plugins-base
];
configureFlags = [

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, openssl, curl, libnotify, gstreamer,
gst_plugins_base, gst-plugins-good, gnome3, makeWrapper, aria2 ? null }:
gst-plugins-base, gst-plugins-good, gnome3, makeWrapper, aria2 ? null }:
stdenv.mkDerivation rec {
name = "uget-${version}";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool makeWrapper ];
buildInputs = [
openssl curl libnotify gstreamer gst_plugins_base gst-plugins-good
openssl curl libnotify gstreamer gst-plugins-base gst-plugins-good
gnome3.gtk gnome3.dconf
]
++ (stdenv.lib.optional (aria2 != null) aria2);

View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeDesktopItem
, libXrender, libX11, libXext, libXt, alsaLib, dbus, dbus_glib, glib, gtk2
, atk, pango, freetype, fontconfig, gdk_pixbuf, cairo, zlib
, gstreamer, gst_plugins_base, gst-plugins-good, gst-ffmpeg, gmp, ffmpeg
, gstreamer, gst-plugins-base, gst-plugins-good, gst-ffmpeg, gmp, ffmpeg
, libpulseaudio
, mediaSupport ? false
}:
@ -11,12 +11,12 @@ let
stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk2 atk pango freetype
fontconfig gdk_pixbuf cairo libXrender libX11 libXext libXt
] ++ stdenv.lib.optionals mediaSupport [
gstreamer gst_plugins_base gmp ffmpeg
gstreamer gst-plugins-base gmp ffmpeg
libpulseaudio
]);
# Ignored if !mediaSupport
gstPlugins = [ gstreamer gst_plugins_base gst-plugins-good gst-ffmpeg ];
gstPlugins = [ gstreamer gst-plugins-base gst-plugins-good gst-ffmpeg ];
gstPluginsPath = stdenv.lib.concatMapStringsSep ":" (x:
"${x}/lib/gstreamer-0.10") gstPlugins;

View File

@ -53,6 +53,7 @@ doNotDisplayTwice rec {
googleAuthenticator = google-authenticator; # added 2016-10-16
grantlee5 = qt5.grantlee; # added 2015-12-19
gst_ffmpeg = gst-ffmpeg; # added 2017-02
gst_plugins_base = gst-plugins-base; # 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

View File

@ -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;
@ -7519,14 +7519,14 @@ with pkgs;
gst_all = {
inherit (pkgs) gstreamer gnonlin gst-python qt-gstreamer;
gstPluginsBase = pkgs.gst_plugins_base;
gstPluginsBase = pkgs.gst-plugins-base;
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-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;
@ -7537,7 +7537,7 @@ with pkgs;
bison = bison2;
};
gst_plugins_base = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-base {
gst-plugins-base = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-base {
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
};