Merging from trunk. I resolved some conflicts; I hope that well.

svn path=/nixpkgs/branches/stdenv-updates/; revision=24429

1 files changed, 17 insertions, 7 deletions

diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
index db817918e021..4a1a2de4dace 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
@@ -1,7 +1,11 @@
 { fetchurl, stdenv, pkgconfig, python, gstreamer
-, libX11, libXv, libXext, alsaLib, cdparanoia , libogg
+, xlibs, alsaLib, cdparanoia, libogg
 , libtheora, libvorbis, freetype, pango
-, liboil, gtk, which, gtkdoc }:
+, liboil, glib
+, # Whether to build no plugins that have external dependencies
+  # (except the ALSA plugin).
+  minimalDeps ? false
+}:
 
 stdenv.mkDerivation rec {
   name = "gst-plugins-base-0.10.30";
@@ -19,12 +23,18 @@ stdenv.mkDerivation rec {
     sed -i -e 's/^   /\t/' docs/{libs,plugins}/Makefile.in
   '';
 
-# TODO : v4l, libvisual
-  propagatedBuildInputs = [gstreamer libX11 libXv libXext alsaLib cdparanoia
-    libogg libtheora libvorbis freetype pango liboil gtk which gtkdoc];
-
-  buildInputs = [pkgconfig python];
+  # TODO : v4l, libvisual
+  buildInputs =
+    [ pkgconfig glib alsaLib ]
+    ++ stdenv.lib.optionals (!minimalDeps)
+      [ xlibs.xlibs xlibs.libXv cdparanoia libogg libtheora libvorbis
+        freetype pango liboil
+      ];
 
+  propagatedBuildInputs = [ gstreamer ];
+ 
+  postInstall = "rm -rf $out/share/gtk-doc";
+  
   meta = {
     homepage = http://gstreamer.freedesktop.org;