ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

Make nixpkgs ready for gst_all attrset removal

Browse Source 
svn path=/nixpkgs/trunk/; revision=33092
This commit is contained in:
Yury G. Kudryashov 2012-03-14 22:44:52 +00:00
parent 03875e0bce
commit fe1115caf4
26 changed files with 73 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/audio/GStreamer/default.nix
View File

@ -1,13 +0,0 @@
{stdenv, fetchurl, perl
, bison, flex, glib
, pkgconfig, libxml2}:
stdenv.mkDerivation {
name = "GStreamer-0.10.10";
src = fetchurl {
url = http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.10.tar.bz2;
md5 = "6875bf0bd3cf38b9ae1362b9e644e6fc";
};
buildInputs = [perl bison flex glib pkgconfig libxml2];
}

4
pkgs/applications/misc/xneur/0.8.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, pcre, GStreamer, glib, libxml2, aspell { stdenv, fetchurl, pkgconfig, pcre, gstreamer, glib, libxml2, aspell
, imlib2, xorg, xosd }: , imlib2, xorg, xosd }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -10,7 +10,7 @@ stdenv.mkDerivation {
}; };
buildInputs = buildInputs =
[ xorg.libX11 pkgconfig pcre GStreamer glib libxml2 aspell [ xorg.libX11 pkgconfig pcre gstreamer glib libxml2 aspell
xorg.libXpm imlib2 xosd xorg.libXt xorg.libXext xorg.libXpm imlib2 xosd xorg.libXt xorg.libXext
]; ];

4
pkgs/applications/misc/xneur/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, xorg, pcre, GStreamer, glib, libxml2 { stdenv, fetchurl, pkgconfig, xorg, pcre, gstreamer, glib, libxml2
, aspell, cairo, imlib2, xosd, libnotify, gtk, pango, atk, enchant, , aspell, cairo, imlib2, xosd, libnotify, gtk, pango, atk, enchant,
gdk_pixbuf}: gdk_pixbuf}:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = buildInputs =
[ xorg.libX11 pkgconfig pcre GStreamer glib libxml2 aspell cairo [ xorg.libX11 pkgconfig pcre gstreamer glib libxml2 aspell cairo
xorg.libXpm imlib2 xosd xorg.libXt xorg.libXext xorg.libXi libnotify xorg.libXpm imlib2 xosd xorg.libXt xorg.libXext xorg.libXi libnotify
gtk pango enchant gdk_pixbuf gtk pango enchant gdk_pixbuf
]; ];

4
pkgs/applications/networking/browsers/opera/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libXt { stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libXt
, freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp , freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp
, libuuid, cups, xz , libuuid, cups, xz
, gstreamer, gstPluginsBase, libxml2 , gstreamer, gst_plugins_base, libxml2
, gtkSupport ? true, glib, gtk, pango, gdk_pixbuf, cairo, atk , gtkSupport ? true, glib, gtk, pango, gdk_pixbuf, cairo, atk
, kdeSupport ? false, qt4, kdelibs , kdeSupport ? false, qt4, kdelibs
}: }:
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ stdenv.gcc.gcc stdenv.gcc.libc zlib libX11 libXt libXext libSM libICE [ stdenv.gcc.gcc stdenv.gcc.libc zlib libX11 libXt libXext libSM libICE
libXft freetype fontconfig libXrender libuuid expat libXft freetype fontconfig libXrender libuuid expat
gstreamer libxml2 gstPluginsBase gstreamer libxml2 gst_plugins_base
] ]
++ stdenv.lib.optionals gtkSupport [ glib gtk pango gdk_pixbuf cairo atk ] ++ stdenv.lib.optionals gtkSupport [ glib gtk pango gdk_pixbuf cairo atk ]
++ stdenv.lib.optionals kdeSupport [ kdelibs qt4 ]; ++ stdenv.lib.optionals kdeSupport [ kdelibs qt4 ];

6
pkgs/applications/networking/browsers/uzbl/default.nix
View File

@ -26,9 +26,9 @@ rec {
doWrap = a.makeManyWrappers "$out/bin/uzbl-core" doWrap = a.makeManyWrappers "$out/bin/uzbl-core"
'' ''
--prefix GST_PLUGIN_PATH : ${a.webkit.gstreamer}/lib/gstreamer-* \ --prefix GST_PLUGIN_PATH : ${a.webkit.gstreamer}/lib/gstreamer-* \
--prefix GST_PLUGIN_PATH : ${a.webkit.gstPluginsBase}/lib/gstreamer-* \ --prefix GST_PLUGIN_PATH : ${a.webkit.gst_plugins_base}/lib/gstreamer-* \
--prefix GST_PLUGIN_PATH : ${a.webkit.gstPluginsGood}/lib/gstreamer-* \ --prefix GST_PLUGIN_PATH : ${a.webkit.gst_plugins_good}/lib/gstreamer-* \
--prefix GST_PLUGIN_PATH : ${a.webkit.gstFfmpeg}/lib/gstreamer-* \ --prefix GST_PLUGIN_PATH : ${a.webkit.gst_ffmpeg}/lib/gstreamer-* \
--prefix GIO_EXTRA_MODULES : ${a.glib_networking}/lib/gio/modules --prefix GIO_EXTRA_MODULES : ${a.glib_networking}/lib/gio/modules
''; '';

2
pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix
View File

@ -14,7 +14,7 @@ rec {
}; };
buildInputs = [gtkspell aspell buildInputs = [gtkspell aspell
GStreamer startupnotification gstreamer startupnotification
libxml2 openssl nss libxml2 openssl nss
libXScrnSaver ncurses scrnsaverproto libXScrnSaver ncurses scrnsaverproto
libX11 xproto kbproto GConf avahi libX11 xproto kbproto GConf avahi

2
pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
View File

@ -14,7 +14,7 @@ rec {
}; };
buildInputs = [gtkspell aspell buildInputs = [gtkspell aspell
GStreamer startupnotification gstreamer startupnotification
libxml2 openssl nss libxml2 openssl nss
libXScrnSaver ncurses scrnsaverproto libXScrnSaver ncurses scrnsaverproto
libX11 xproto kbproto GConf avahi libX11 xproto kbproto GConf avahi

4
pkgs/applications/networking/instant-messengers/pidgin/default.nix
View File

@ -11,7 +11,7 @@
* - doxygen * - doxygen
*/ */
{ stdenv, fetchurl, pkgconfig, gtk, gtkspell, aspell, { stdenv, fetchurl, pkgconfig, gtk, gtkspell, aspell,
GStreamer, gstPluginsBase, startupnotification, gettext, gstreamer, gst_plugins_base, startupnotification, gettext,
perl, perlXMLParser, libxml2, nss, nspr, farsight2, perl, perlXMLParser, libxml2, nss, nspr, farsight2,
libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn
, lib, python , lib, python
@ -30,7 +30,7 @@ stdenv.mkDerivation {
inherit nss ncurses; inherit nss ncurses;
buildInputs = [ buildInputs = [
gtkspell aspell gtkspell aspell
GStreamer gstPluginsBase startupnotification gstreamer gst_plugins_base startupnotification
libxml2] libxml2]
++ (lib.optional (openssl != null) openssl) ++ (lib.optional (openssl != null) openssl)
++ (lib.optional (gnutls != null) gnutls) ++ (lib.optional (gnutls != null) gnutls)

6
pkgs/applications/networking/instant-messengers/psi/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, aspell, qt4, zlib, sox, libX11, xproto, libSM, { stdenv, fetchurl, aspell, qt4, zlib, sox, libX11, xproto, libSM,
libICE, qca2, pkgconfig, qca2_ossl, liboil, speex, gst_all, which, glib }: libICE, qca2, pkgconfig, qca2_ossl, liboil, speex, callPackage, which, glib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "psi-0.14"; name = "psi-0.14";
@ -21,9 +21,7 @@ stdenv.mkDerivation rec {
" --disable-bundled-qca" " --disable-bundled-qca"
]; ];
psiMedia = (import ./psimedia.nix) { psiMedia = callPackage ./psimedia.nix { };
inherit stdenv fetchurl qt4 speex gst_all liboil which glib pkgconfig;
};
postInstall = '' postInstall = ''
PSI_PLUGINS="$out/lib/psi/plugins" PSI_PLUGINS="$out/lib/psi/plugins"

5
pkgs/applications/networking/instant-messengers/psi/psimedia.nix
View File

@ -1,4 +1,5 @@
{stdenv, fetchurl, qt4, gst_all, liboil, speex, which, glib, pkgconfig}: {stdenv, fetchurl, qt4, gstreamer, gst_plugins_base, liboil, speex, which
, glib, pkgconfig}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "psimedia"; name = "psimedia";
@ -8,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0fxjdz8afh75gfx2msysb1gss6zx578l3224jvc9jhm99w1ii781"; sha256 = "0fxjdz8afh75gfx2msysb1gss6zx578l3224jvc9jhm99w1ii781";
}; };
buildInputs = [qt4 gst_all.gstreamer gst_all.gstPluginsBase liboil speex which glib pkgconfig]; buildInputs = [qt4 gstreamer gst_plugins_base liboil speex which glib pkgconfig];
configurePhase = ''./configure''; configurePhase = ''./configure'';

4
pkgs/applications/office/openoffice/libreoffice.nix
View File

@ -4,7 +4,7 @@
, bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which , bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which
, icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups , icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups
, libXinerama, openssl, gperf, cppunit, GConf, ORBit2, poppler , libXinerama, openssl, gperf, cppunit, GConf, ORBit2, poppler
, librsvg, gnome_vfs, gstreamer, gstPluginsBase, mesa , librsvg, gnome_vfs, gstreamer, gst_plugins_base, mesa
, autoconf, automake, openldap, bash , autoconf, automake, openldap, bash
, fontsConf , fontsConf
, langs ? [ "ca" "ru" "eo" "fr" "nl" "de" "en-GB" ] , langs ? [ "ca" "ru" "eo" "fr" "nl" "de" "en-GB" ]
@ -137,7 +137,7 @@ stdenv.mkDerivation rec {
libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl
libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack
getopt file jdk cairo which icu boost libXext libX11 libXtst libXi mesa getopt file jdk cairo which icu boost libXext libX11 libXtst libXi mesa
cups libXinerama openssl gperf GConf ORBit2 gnome_vfs gstreamer gstPluginsBase cups libXinerama openssl gperf GConf ORBit2 gnome_vfs gstreamer gst_plugins_base
ant autoconf openldap cppunit poppler librsvg automake ant autoconf openldap cppunit poppler librsvg automake
]; ];

16
pkgs/applications/video/gnash/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl { stdenv, fetchurl
, SDL, SDL_mixer, gstreamer, gstPluginsBase, gstPluginsGood , SDL, SDL_mixer, gstreamer, gst_plugins_base, gst_plugins_good
, gstFfmpeg, speex , gst_ffmpeg, speex
, libogg, libxml2, libjpeg, mesa, libpng, libungif, libtool , libogg, libxml2, libjpeg, mesa, libpng, libungif, libtool
, boost, freetype, agg, dbus, curl, pkgconfig, gettext , boost, freetype, agg, dbus, curl, pkgconfig, gettext
, glib, gtk, gtkglext, x11, ming, dejagnu, python, perl , glib, gtk, gtkglext, x11, ming, dejagnu, python, perl
@ -44,8 +44,8 @@ stdenv.mkDerivation rec {
# XXX: KDE is supported as well so we could make it available optionally. # XXX: KDE is supported as well so we could make it available optionally.
buildInputs = [ buildInputs = [
gettext x11 SDL SDL_mixer gstreamer gstPluginsBase gstPluginsGood gettext x11 SDL SDL_mixer gstreamer gst_plugins_base gst_plugins_good
gstFfmpeg speex libtool gst_ffmpeg speex libtool
libogg libxml2 libjpeg mesa libpng libungif boost freetype agg libogg libxml2 libjpeg mesa libpng libungif boost freetype agg
dbus curl pkgconfig glib gtk gtkglext dbus curl pkgconfig glib gtk gtkglext
xulrunner xulrunner
@ -63,10 +63,10 @@ stdenv.mkDerivation rec {
--enable-media=gst \ --enable-media=gst \
--enable-gui=gtk" --enable-gui=gtk"
# In `libmedia', Gnash compiles with "-I$gstPluginsBase/include", # In `libmedia', Gnash compiles with "-I$gst_plugins_base/include",
# whereas it really needs "-I$gstPluginsBase/include/gstreamer-0.10". # whereas it really needs "-I$gst_plugins_base/include/gstreamer-0.10".
# Work around this using GCC's $CPATH variable. # Work around this using GCC's $CPATH variable.
export CPATH="${gstPluginsBase}/include/gstreamer-0.10:${gstPluginsGood}/include/gstreamer-0.10" export CPATH="${gst_plugins_base}/include/gstreamer-0.10:${gst_plugins_good}/include/gstreamer-0.10"
echo "\$CPATH set to \`$CPATH'" echo "\$CPATH set to \`$CPATH'"
echo "\$GST_PLUGIN_PATH set to \`$GST_PLUGIN_PATH'" echo "\$GST_PLUGIN_PATH set to \`$GST_PLUGIN_PATH'"
@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
do do
wrapProgram "$prog" --prefix \ wrapProgram "$prog" --prefix \
GST_PLUGIN_PATH ":" \ GST_PLUGIN_PATH ":" \
"${gstPluginsBase}/lib/gstreamer-0.10:${gstPluginsGood}/lib/gstreamer-0.10:${gstFfmpeg}/lib/gstreamer-0.10" "${gst_plugins_base}/lib/gstreamer-0.10:${gst_plugins_good}/lib/gstreamer-0.10:${gst_ffmpeg}/lib/gstreamer-0.10"
done done
''; '';

10
pkgs/desktops/xfce-4.6/applications/xfce4-mixer.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, gst_all, gtk { stdenv, fetchurl, pkgconfig, intltool, glib, gstreamer, gst_plugins_base
, libxfce4util, libxfcegui4, xfce4panel, xfconf, makeWrapper }: , gtk, libxfce4util, libxfcegui4, xfce4panel, xfconf, makeWrapper }:
let let
# The usual Gstreamer plugins package has a zillion dependencies # The usual Gstreamer plugins package has a zillion dependencies
# that we don't need for a simple mixer, so build a minimal package. # that we don't need for a simple mixer, so build a minimal package.
gstPluginsBase = gst_all.gstPluginsBase.override { gst_plugins_minimal = gst_plugins_base.override {
minimalDeps = true; minimalDeps = true;
}; };
@ -20,14 +20,14 @@ stdenv.mkDerivation rec {
}; };
buildInputs = buildInputs =
[ pkgconfig intltool glib gst_all.gstreamer gstPluginsBase gtk [ pkgconfig intltool glib gstreamer gst_plugins_minimal gtk
libxfce4util libxfcegui4 xfce4panel xfconf makeWrapper libxfce4util libxfcegui4 xfce4panel xfconf makeWrapper
]; ];
postInstall = postInstall =
'' ''
mkdir -p $out/nix-support mkdir -p $out/nix-support
echo ${gstPluginsBase} > $out/nix-support/propagated-user-env-packages echo ${gst_plugins_minimal} > $out/nix-support/propagated-user-env-packages
''; '';
meta = { meta = {

10
pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, gst_all, gtk { stdenv, fetchurl, pkgconfig, intltool, glib, gstreamer, gst_plugins_base
, libxfce4util, libxfce4ui, xfce4panel, xfconf }: , gtk, libxfce4util, libxfce4ui, xfce4panel, xfconf }:
let let
# The usual Gstreamer plugins package has a zillion dependencies # The usual Gstreamer plugins package has a zillion dependencies
# that we don't need for a simple mixer, so build a minimal package. # that we don't need for a simple mixer, so build a minimal package.
gstPluginsBase = gst_all.gstPluginsBase.override { gst_plugins_minimal = gst_plugins_base.override {
minimalDeps = true; minimalDeps = true;
}; };
@ -20,14 +20,14 @@ stdenv.mkDerivation rec {
}; };
buildInputs = buildInputs =
[ pkgconfig intltool glib gst_all.gstreamer gstPluginsBase gtk [ pkgconfig intltool glib gstreamer gst_plugins_minimal gtk
libxfce4util libxfce4ui xfce4panel xfconf libxfce4util libxfce4ui xfce4panel xfconf
]; ];
postInstall = postInstall =
'' ''
mkdir -p $out/nix-support mkdir -p $out/nix-support
echo ${gstPluginsBase} > $out/nix-support/propagated-user-env-packages echo ${gst_plugins_minimal} > $out/nix-support/propagated-user-env-packages
''; '';
meta = { meta = {

4
pkgs/development/libraries/farsight2/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libnice, pkgconfig, python, gstreamer, gstPluginsBase { stdenv, fetchurl, libnice, pkgconfig, python, gstreamer, gst_plugins_base
, pygobject, gst_python, gupnp_igd }: , pygobject, gst_python, gupnp_igd }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildNativeInputs = [ pkgconfig ]; buildNativeInputs = [ pkgconfig ];
propagatedBuildInputs = [ gstreamer gstPluginsBase ]; propagatedBuildInputs = [ gstreamer gst_plugins_base ];
meta = { meta = {
homepage = http://farsight.freedesktop.org/wiki/; homepage = http://farsight.freedesktop.org/wiki/;

4
pkgs/development/libraries/libnice/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, gupnp_igd, gstreamer, gstPluginsBase }: { stdenv, fetchurl, pkgconfig, glib, gupnp_igd, gstreamer, gst_plugins_base }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libnice-0.1.1"; name = "libnice-0.1.1";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0jcpb953jn7c3ng2vbkljybzh63x6mg4m6rjxj1s1iccm3fi6qki"; sha256 = "0jcpb953jn7c3ng2vbkljybzh63x6mg4m6rjxj1s1iccm3fi6qki";
}; };
buildInputs = [ pkgconfig glib gupnp_igd gstreamer gstPluginsBase ]; buildInputs = [ pkgconfig glib gupnp_igd gstreamer gst_plugins_base ];
meta = { meta = {
homepage = http://nice.freedesktop.org/wiki/; homepage = http://nice.freedesktop.org/wiki/;

7
pkgs/development/libraries/phonon-backend-gstreamer/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, cmake, automoc4, qt4, pkgconfig, phonon, gst_all, xz }: { stdenv, fetchurl, cmake, automoc4, qt4, pkgconfig, phonon, gstreamer
, gst_plugins_base }:
let let
version = "4.6.0"; version = "4.6.0";
@ -13,9 +14,9 @@ stdenv.mkDerivation rec {
sha256 = "0bwkd1dmj8p4m5xindh6ixfvifq36qmvfn246vx22syqfl6f1m2v"; sha256 = "0bwkd1dmj8p4m5xindh6ixfvifq36qmvfn246vx22syqfl6f1m2v";
}; };
buildInputs = [ phonon qt4 gst_all.gstreamer gst_all.gstPluginsBase ]; buildInputs = [ phonon qt4 gstreamer gst_plugins_base ];
buildNativeInputs = [ cmake automoc4 xz pkgconfig ]; buildNativeInputs = [ cmake automoc4 pkgconfig ];
meta = { meta = {
homepage = http://phonon.kde.org/; homepage = http://phonon.kde.org/;

4
pkgs/development/libraries/qt-4.x/4.8/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, substituteAll { stdenv, fetchurl, substituteAll
, alsaLib, gstreamer, gstPluginsBase , alsaLib, gstreamer, gst_plugins_base
, libXrender, libXinerama, libXcursor, libXmu , libXv, libXext , libXrender, libXinerama, libXcursor, libXmu , libXv, libXext
, libXfixes, libXrandr, libSM, freetype, fontconfig , libXfixes, libXrandr, libSM, freetype, fontconfig
, zlib, libjpeg, libpng, libmng, which, mesa, openssl, dbus, cups, pkgconfig , zlib, libjpeg, libpng, libmng, which, mesa, openssl, dbus, cups, pkgconfig
@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
[ libXrender libXrandr libXinerama libXcursor libXext libXfixes [ libXrender libXrandr libXinerama libXcursor libXext libXfixes
libXv libXi libSM mesa libXv libXi libSM mesa
alsaLib zlib libpng openssl dbus.libs freetype fontconfig glib alsaLib zlib libpng openssl dbus.libs freetype fontconfig glib
gstreamer gstPluginsBase gstreamer gst_plugins_base
]; ];
# The following libraries are only used in plugins # The following libraries are only used in plugins

4
pkgs/development/libraries/telepathy/farsight/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, telepathy_glib, farsight2, gstPluginsBase, dbus_glib { stdenv, fetchurl, telepathy_glib, farsight2, gst_plugins_base, dbus_glib
, pkgconfig, libxslt, python, gstreamer, gst_python, pygobject }: , pkgconfig, libxslt, python, gstreamer, gst_python, pygobject }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0sajy2w109zc6assqby3cfqr7cckwhfsngkhjczz67grb6rbi29c"; sha256 = "0sajy2w109zc6assqby3cfqr7cckwhfsngkhjczz67grb6rbi29c";
}; };
buildInputs = [ gstPluginsBase gst_python pygobject ]; buildInputs = [ gst_plugins_base gst_python pygobject ];
propagatedBuildInputs = [ dbus_glib farsight2 telepathy_glib gstreamer ]; propagatedBuildInputs = [ dbus_glib farsight2 telepathy_glib gstreamer ];
buildNativeInputs = [ pkgconfig python libxslt]; buildNativeInputs = [ pkgconfig python libxslt];

4
pkgs/development/libraries/webkit/default.nix
View File

@ -17,7 +17,7 @@ rec {
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
gstreamer gstPluginsBase gstFfmpeg gstPluginsGood gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good
]; ];
configureFlags = [ configureFlags = [
@ -85,6 +85,6 @@ rec {
maintainers = [stdenv.lib.maintainers.raskin]; maintainers = [stdenv.lib.maintainers.raskin];
}; };
passthru = { passthru = {
inherit gstreamer gstPluginsBase gstPluginsGood gstFfmpeg; inherit gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg;
}; };
} }

4
pkgs/development/libraries/webkit/svn.nix
View File

@ -17,7 +17,7 @@ rec {
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
gstreamer gstPluginsBase gstFfmpeg gstPluginsGood gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good
]; ];
configureCommand = "./autogen.sh "; configureCommand = "./autogen.sh ";
@ -86,6 +86,6 @@ rec {
maintainers = [stdenv.lib.maintainers.raskin]; maintainers = [stdenv.lib.maintainers.raskin];
}; };
passthru = { passthru = {
inherit gstreamer gstPluginsBase gstPluginsGood gstFfmpeg; inherit gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg;
}; };
} }

4
pkgs/development/libraries/wxGTK-2.8/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto { stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
, gstreamer, gstPluginsBase, GConf , gstreamer, gst_plugins_base, GConf
, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true, , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true,
}: }:
@ -15,7 +15,7 @@ stdenv.mkDerivation {
sha256 = "1gjs9vfga60mk4j4ngiwsk9h6c7j22pw26m3asxr1jwvqbr8kkqk"; sha256 = "1gjs9vfga60mk4j4ngiwsk9h6c7j22pw26m3asxr1jwvqbr8kkqk";
}; };
buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gstPluginsBase GConf ] buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf ]
++ optional withMesa mesa; ++ optional withMesa mesa;
buildNativeInputs = [ pkgconfig ]; buildNativeInputs = [ pkgconfig ];

4
pkgs/development/libraries/wxGTK-2.9/2.9.0.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto { stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
, gstreamer, gstPluginsBase, GConf , gstreamer, gst_plugins_base, GConf
, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true, , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true,
}: }:
@ -15,7 +15,7 @@ stdenv.mkDerivation {
sha256 = "10n75mpypd9411b29gxmi0g2s7dgbfwkgiyhxwkjsyrmyvfc3xcc"; sha256 = "10n75mpypd9411b29gxmi0g2s7dgbfwkgiyhxwkjsyrmyvfc3xcc";
}; };
buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gstPluginsBase GConf ] buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf ]
++ optional withMesa mesa; ++ optional withMesa mesa;
buildNativeInputs = [ pkgconfig ]; buildNativeInputs = [ pkgconfig ];

4
pkgs/development/libraries/wxGTK-2.9/2.9.1.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto { stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
, gstreamer, gstPluginsBase, GConf , gstreamer, gst_plugins_base, GConf
, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true, , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true,
}: }:
@ -15,7 +15,7 @@ stdenv.mkDerivation {
sha256 = "1f6pdlzjawhhs17hmimk0l1n3g4g48n2iqrgl181xqfrbxyz75b8"; sha256 = "1f6pdlzjawhhs17hmimk0l1n3g4g48n2iqrgl181xqfrbxyz75b8";
}; };
buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gstPluginsBase GConf ] buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf ]
++ optional withMesa mesa; ++ optional withMesa mesa;
buildNativeInputs = [ pkgconfig ]; buildNativeInputs = [ pkgconfig ];

4
pkgs/os-specific/linux/bluez/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, dbus, glib, libusb, alsaLib, python, makeWrapper { stdenv, fetchurl, pkgconfig, dbus, glib, libusb, alsaLib, python, makeWrapper
, pythonDBus, pygobject, gst_all, readline, libsndfile }: , pythonDBus, pygobject, readline, libsndfile }:
assert stdenv.isLinux; assert stdenv.isLinux;
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
readline libsndfile readline libsndfile
# Disables GStreamer; not clear what it gains us other than a # Disables GStreamer; not clear what it gains us other than a
# zillion extra dependencies. # zillion extra dependencies.
# gst_all.gstreamer gst_all.gstPluginsBase # gstreamer gst_plugins_base
]; ];
configureFlags = "--localstatedir=/var --enable-cups"; configureFlags = "--localstatedir=/var --enable-cups";

47
pkgs/top-level/all-packages.nix
View File

@ -3404,9 +3404,7 @@ let
faad2 = callPackage ../development/libraries/faad2 { }; faad2 = callPackage ../development/libraries/faad2 { };
farsight2 = callPackage ../development/libraries/farsight2 { farsight2 = callPackage ../development/libraries/farsight2 { };
inherit (gst_all) gstreamer gstPluginsBase gst_python;
};
fcgi = callPackage ../development/libraries/fcgi { }; fcgi = callPackage ../development/libraries/fcgi { };
@ -3894,9 +3892,7 @@ let
libcaca = callPackage ../development/libraries/libcaca { }; libcaca = callPackage ../development/libraries/libcaca { };
libcanberra = callPackage ../development/libraries/libcanberra { libcanberra = callPackage ../development/libraries/libcanberra { };
# gstreamer = gst_all.gstreamer;
};
libcdaudio = callPackage ../development/libraries/libcdaudio { }; libcdaudio = callPackage ../development/libraries/libcdaudio { };
@ -4036,9 +4032,7 @@ let
libnatspec = callPackage ../development/libraries/libnatspec { }; libnatspec = callPackage ../development/libraries/libnatspec { };
libnice = callPackage ../development/libraries/libnice { libnice = callPackage ../development/libraries/libnice { };
inherit (gst_all) gstreamer gstPluginsBase;
};
libplist = callPackage ../development/libraries/libplist { }; libplist = callPackage ../development/libraries/libplist { };
@ -4426,13 +4420,11 @@ let
opencv = callPackage ../development/libraries/opencv { opencv = callPackage ../development/libraries/opencv {
ffmpeg = ffmpeg_0_6_90; ffmpeg = ffmpeg_0_6_90;
inherit (gst_all) gstreamer;
}; };
opencv_2_1 = callPackage ../development/libraries/opencv/2.1.nix { opencv_2_1 = callPackage ../development/libraries/opencv/2.1.nix {
ffmpeg = ffmpeg_0_6_90; ffmpeg = ffmpeg_0_6_90;
libpng = libpng12; libpng = libpng12;
inherit (gst_all) gstreamer;
}; };
# this ctl version is needed by openexr_viewers # this ctl version is needed by openexr_viewers
@ -4543,8 +4535,6 @@ let
qt48 = callPackage ../development/libraries/qt-4.x/4.8 { qt48 = callPackage ../development/libraries/qt-4.x/4.8 {
# GNOME dependencies are not used unless gtkStyle == true # GNOME dependencies are not used unless gtkStyle == true
inherit (pkgs.gnome) libgnomeui GConf gnome_vfs; inherit (pkgs.gnome) libgnomeui GConf gnome_vfs;
# GStreamer is required for HTML5 video in QtWebKit
inherit (pkgs.gst_all) gstreamer gstPluginsBase;
}; };
qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { }; qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { };
@ -4681,9 +4671,7 @@ let
telepathy_glib = callPackage ../development/libraries/telepathy/glib { }; telepathy_glib = callPackage ../development/libraries/telepathy/glib { };
telepathy_farsight = callPackage ../development/libraries/telepathy/farsight { telepathy_farsight = callPackage ../development/libraries/telepathy/farsight { };
inherit (pkgs.gst_all) gstPluginsBase gstreamer gst_python;
};
telepathy_qt = callPackage ../development/libraries/telepathy/qt { }; telepathy_qt = callPackage ../development/libraries/telepathy/qt { };
@ -4736,8 +4724,8 @@ let
icu cairo perl intltool automake libtool icu cairo perl intltool automake libtool
pkgconfig autoconf bison libproxy enchant pkgconfig autoconf bison libproxy enchant
python ruby which flex geoclue; python ruby which flex geoclue;
inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg inherit gstreamer gst_plugins_base gst_ffmpeg
gstPluginsGood; gst_plugins_good;
inherit (xlibs) libXt renderproto libXrender; inherit (xlibs) libXt renderproto libXrender;
libpng = libpng12; libpng = libpng12;
}; };
@ -4751,8 +4739,8 @@ let
icu cairo perl intltool automake libtool icu cairo perl intltool automake libtool
pkgconfig autoconf bison libproxy enchant pkgconfig autoconf bison libproxy enchant
python ruby which flex geoclue; python ruby which flex geoclue;
inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg inherit gstreamer gst_plugins_base gst_ffmpeg
gstPluginsGood; gst_plugins_good;
inherit (xlibs) libXt renderproto libXrender; inherit (xlibs) libXt renderproto libXrender;
libpng = libpng12; libpng = libpng12;
}; };
@ -4762,19 +4750,16 @@ let
wxGTK = wxGTK28; wxGTK = wxGTK28;
wxGTK28 = callPackage ../development/libraries/wxGTK-2.8 { wxGTK28 = callPackage ../development/libraries/wxGTK-2.8 {
inherit (gst_all) gstreamer gstPluginsBase;
inherit (gnome) GConf; inherit (gnome) GConf;
withMesa = lib.elem system lib.platforms.mesaPlatforms; withMesa = lib.elem system lib.platforms.mesaPlatforms;
}; };
wxGTK290 = callPackage ../development/libraries/wxGTK-2.9/2.9.0.nix { wxGTK290 = callPackage ../development/libraries/wxGTK-2.9/2.9.0.nix {
inherit (gst_all) gstreamer gstPluginsBase;
inherit (gnome) GConf; inherit (gnome) GConf;
withMesa = lib.elem system lib.platforms.mesaPlatforms; withMesa = lib.elem system lib.platforms.mesaPlatforms;
}; };
wxGTK291 = callPackage ../development/libraries/wxGTK-2.9/2.9.1.nix { wxGTK291 = callPackage ../development/libraries/wxGTK-2.9/2.9.1.nix {
inherit (gst_all) gstreamer gstPluginsBase;
inherit (gnome) GConf; inherit (gnome) GConf;
withMesa = lib.elem system lib.platforms.mesaPlatforms; withMesa = lib.elem system lib.platforms.mesaPlatforms;
}; };
@ -6315,8 +6300,7 @@ let
carrier = builderDefsPackage (import ../applications/networking/instant-messengers/carrier/2.5.0.nix) { carrier = builderDefsPackage (import ../applications/networking/instant-messengers/carrier/2.5.0.nix) {
inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss
gtkspell aspell gettext ncurses avahi dbus dbus_glib python gtkspell aspell gettext ncurses avahi dbus dbus_glib python
libtool automake autoconf; libtool automake autoconf gstreamer;
GStreamer = gst_all.gstreamer;
inherit gtk glib; inherit gtk glib;
inherit (gnome) startupnotification GConf ; inherit (gnome) startupnotification GConf ;
inherit (xlibs) libXScrnSaver scrnsaverproto libX11 xproto kbproto; inherit (xlibs) libXScrnSaver scrnsaverproto libX11 xproto kbproto;
@ -6724,7 +6708,6 @@ let
gnash = callPackage ../applications/video/gnash { gnash = callPackage ../applications/video/gnash {
xulrunner = icecatXulrunner3; xulrunner = icecatXulrunner3;
inherit (gnome) gtkglext; inherit (gnome) gtkglext;
inherit (gst_all) gstreamer gstPluginsBase gstPluginsGood gstFfmpeg;
}; };
gnome_mplayer = callPackage ../applications/video/gnome-mplayer { gnome_mplayer = callPackage ../applications/video/gnome-mplayer {
@ -6926,7 +6909,6 @@ let
libreoffice = callPackage ../applications/office/openoffice/libreoffice.nix { libreoffice = callPackage ../applications/office/openoffice/libreoffice.nix {
inherit (perlPackages) ArchiveZip CompressZlib; inherit (perlPackages) ArchiveZip CompressZlib;
inherit (gnome) GConf ORBit2 gnome_vfs; inherit (gnome) GConf ORBit2 gnome_vfs;
inherit (gst_all) gstreamer gstPluginsBase;
fontsConf = makeFontsConf { fontsConf = makeFontsConf {
fontDirectories = [ fontDirectories = [
freefont_ttf xorg.fontmiscmisc xorg.fontbhttf freefont_ttf xorg.fontmiscmisc xorg.fontbhttf
@ -7129,7 +7111,6 @@ let
opera = callPackage ../applications/networking/browsers/opera { opera = callPackage ../applications/networking/browsers/opera {
inherit (pkgs.kde4) kdelibs; inherit (pkgs.kde4) kdelibs;
inherit (pkgs.gst_all) gstreamer gstPluginsBase;
}; };
pan = callPackage ../applications/networking/newsreaders/pan { pan = callPackage ../applications/networking/newsreaders/pan {
@ -7150,9 +7131,7 @@ let
openssl = if (getConfig ["pidgin" "openssl"] true) then openssl else null; openssl = if (getConfig ["pidgin" "openssl"] true) then openssl else null;
gnutls = if (getConfig ["pidgin" "gnutls"] false) then gnutls else null; gnutls = if (getConfig ["pidgin" "gnutls"] false) then gnutls else null;
libgcrypt = if (getConfig ["pidgin" "gnutls"] false) then libgcrypt else null; libgcrypt = if (getConfig ["pidgin" "gnutls"] false) then libgcrypt else null;
GStreamer = gst_all.gstreamer;
inherit (gnome) startupnotification; inherit (gnome) startupnotification;
inherit (gst_all) gstPluginsBase;
}; };
pidginlatex = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex { pidginlatex = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex {
@ -7560,13 +7539,9 @@ let
xineUI = callPackage ../applications/video/xine-ui { }; xineUI = callPackage ../applications/video/xine-ui { };
xneur = callPackage ../applications/misc/xneur { xneur = callPackage ../applications/misc/xneur { };
GStreamer=gst_all.gstreamer;
};
xneur_0_8 = callPackage ../applications/misc/xneur/0.8.nix { xneur_0_8 = callPackage ../applications/misc/xneur/0.8.nix { };
GStreamer = gst_all.gstreamer;
};
xournal = callPackage ../applications/graphics/xournal { xournal = callPackage ../applications/graphics/xournal {
inherit (gnome) libgnomeprint libgnomeprintui libgnomecanvas; inherit (gnome) libgnomeprint libgnomeprintui libgnomecanvas;