diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-23 14:52:21 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-23 14:52:21 +0000 |
commit | 6dc839d3445e66b259361f08838a8c05b1912e68 (patch) | |
tree | 5ef88f8fe4cb6f75cf0a1c1e821945c7186491c7 /pkgs/development/libraries/gstreamer/default.nix | |
parent | 4309788df022c89765cd7f6b178f4ce7a08db600 (diff) | |
parent | 327a2eae30b48277bd453842d03a144f618822b2 (diff) | |
download | nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.gz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.bz2 nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.lz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.xz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.zst nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.zip |
Merging from trunk. I resolved some conflicts; I hope that well.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
Diffstat (limited to 'pkgs/development/libraries/gstreamer/default.nix')
-rw-r--r-- | pkgs/development/libraries/gstreamer/default.nix | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index a41e69488921..37c88580a8ac 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -1,32 +1,17 @@ -args: with args; +{ callPackage, pkgs }: + rec { - gstreamer = makeOverridable (import ./gstreamer) { - inherit (args) fetchurl stdenv perl bison flex - pkgconfig python which glib libxml2; + gstreamer = callPackage ./gstreamer { + flex = pkgs.flex2535; }; - gstPluginsBase = makeOverridable (import ./gst-plugins-base) { - inherit gstreamer; - inherit (args) fetchurl stdenv pkgconfig python - libX11 libXv libXext alsaLib cdparanoia libogg libtheora - libvorbis freetype pango liboil gtk which gtkdoc; - }; + gstPluginsBase = callPackage ./gst-plugins-base { }; - gstPluginsGood = makeOverridable (import ./gst-plugins-good) { - inherit gstPluginsBase; - inherit (args) fetchurl stdenv pkgconfig aalib cairo flac hal - libjpeg zlib speex libpng libdv libcaca dbus libiec61883 - libavc1394 ladspaH taglib gdbm pulseaudio libsoup libcap - libtasn1; - }; + gstPluginsGood = callPackage ./gst-plugins-good { }; - gstFfmpeg = makeOverridable (import ./gst-ffmpeg) { - inherit fetchurl stdenv pkgconfig gstPluginsBase bzip2; - }; + gstFfmpeg = callPackage ./gst-ffmpeg { }; - gnonlin = makeOverridable (import ./gnonlin) { - inherit fetchurl stdenv pkgconfig gstreamer gstPluginsBase; - }; + gnonlin = callPackage ./gnonlin { }; # Header files are in include/${prefix}/ prefix = "gstreamer-0.10"; |