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

Move gstreamer packages to top-level

Browse Source 
This will make callPackage work with gst.
* Rename gstCamelCase to gst_with_underscores.
* Add compatibility attributes.

svn path=/nixpkgs/trunk/; revision=33078
This commit is contained in:
Yury G. Kudryashov 2012-03-14 19:35:35 +00:00
parent 7a31872261
commit 4d9fb0a594
9 changed files with 40 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/development/libraries/gstreamer/default.nix
View File

@ -1,24 +0,0 @@
{ callPackage }:
rec {
gstreamer = callPackage ./gstreamer { };
gstPluginsBase = callPackage ./gst-plugins-base { };
gstPluginsGood = callPackage ./gst-plugins-good { };
gstPluginsUgly = callPackage ./gst-plugins-ugly { };
gstPluginsBad = callPackage ./gst-plugins-bad { };
gstFfmpeg = callPackage ./gst-ffmpeg { };
gnonlin = callPackage ./gnonlin { };
gst_python = callPackage ./gst-python {};
qt_gstreamer = callPackage ./qt-gstreamer {};
# Header files are in include/${prefix}/
prefix = "gstreamer-0.10";
}

4
pkgs/development/libraries/gstreamer/gnonlin/default.nix
View File

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

4
pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix
View File

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

4
pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix
View File

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

4
pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, pkgconfig, gstPluginsBase, aalib, cairo { fetchurl, stdenv, pkgconfig, gst_plugins_base, aalib, cairo
, flac, libjpeg, zlib, speex, libpng, libdv, libcaca , flac, libjpeg, zlib, speex, libpng, libdv, libcaca
, libiec61883, libavc1394, taglib, pulseaudio , libiec61883, libavc1394, taglib, pulseaudio
, glib, gstreamer, bzip2 , glib, gstreamer, bzip2
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
configureFlags = "--disable-oss"; configureFlags = "--disable-oss";
buildInputs = buildInputs =
[ pkgconfig glib gstreamer gstPluginsBase libavc1394 libiec61883 [ pkgconfig glib gstreamer gst_plugins_base libavc1394 libiec61883
aalib libcaca cairo libdv flac libjpeg libpng pulseaudio speex aalib libcaca cairo libdv flac libjpeg libpng pulseaudio speex
taglib bzip2 taglib bzip2
]; ];

4
pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gstPluginsBase { fetchurl, stdenv, pkgconfig, glib, gstreamer, gst_plugins_base
, libmad, libdvdread, libmpeg2, libcdio, a52dec }: , libmad, libdvdread, libmpeg2, libcdio, a52dec }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = buildInputs =
[ pkgconfig glib gstreamer gstPluginsBase libmad libdvdread a52dec ]; [ pkgconfig glib gstreamer gst_plugins_base libmad libdvdread a52dec ];
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/development/libraries/gstreamer/gst-python/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, python, gstreamer { fetchurl, stdenv, pkgconfig, python, gstreamer
, gstPluginsBase, pygtk , gst_plugins_base, pygtk
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = buildInputs =
[ pkgconfig gstPluginsBase pygtk ] [ pkgconfig gst_plugins_base pygtk ]
; ;
propagatedBuildInputs = [ gstreamer python ]; propagatedBuildInputs = [ gstreamer python ];

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gstreamer, gstPluginsBase, boost, glib, qt4, cmake { stdenv, fetchurl, gstreamer, gst_plugins_base, boost, glib, qt4, cmake
, automoc4, flex, bison, pkgconfig }: , automoc4, flex, bison, pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0g377jlzlwgywgk7nbv9fd0aimv8wpzrymwzdiaffczxv5xvip5h"; sha256 = "0g377jlzlwgywgk7nbv9fd0aimv8wpzrymwzdiaffczxv5xvip5h";
}; };
buildInputs = [ gstreamer gstPluginsBase boost glib qt4 ]; buildInputs = [ gstreamer gst_plugins_base boost glib qt4 ];
buildNativeInputs = [ cmake automoc4 flex bison pkgconfig ]; buildNativeInputs = [ cmake automoc4 flex bison pkgconfig ];
patches = [ ./boost1.48.patch ]; patches = [ ./boost1.48.patch ];

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

@ -3679,10 +3679,32 @@ let
#GMP ex-satellite, so better keep it near gmp #GMP ex-satellite, so better keep it near gmp
mpfr = callPackage ../development/libraries/mpfr { }; mpfr = callPackage ../development/libraries/mpfr { };
gst_all = recurseIntoAttrs gst_all = {
(let callPackage = newScope pkgs.gst_all; in inherit (pkgs) gstreamer gnonlin gst_python qt_gstreamer;
import ../development/libraries/gstreamer { inherit callPackage; } gstPluginsBase = pkgs.gst_plugins_base;
); gstPluginsBad = pkgs.gst_plugins_bad;
gstPluginsGood = pkgs.gst_plugins_good;
gstPluginsUgly = pkgs.gst_plugins_ugly;
gstFfmpeg = pkgs.gst_ffmpeg;
};
gstreamer = callPackage ../development/libraries/gstreamer/gstreamer {};
gst_plugins_base = callPackage ../development/libraries/gstreamer/gst-plugins-base {};
gst_plugins_good = callPackage ../development/libraries/gstreamer/gst-plugins-good {};
gst_plugins_bad = callPackage ../development/libraries/gstreamer/gst-plugins-bad {};
gst_plugins_ugly = callPackage ../development/libraries/gstreamer/gst-plugins-ugly {};
gst_ffmpeg = callPackage ../development/libraries/gstreamer/gst-ffmpeg {};
gst_python = callPackage ../development/libraries/gstreamer/gst-python {};
gnonlin = callPackage ../development/libraries/gstreamer/gnonlin {};
qt_gstreamer = callPackage ../development/libraries/gstreamer/qt-gstreamer {};
gnet = callPackage ../development/libraries/gnet { }; gnet = callPackage ../development/libraries/gnet { };