Try to handle GStreamer correctly in webkit

svn path=/nixpkgs/trunk/; revision=16544

pkgs/applications/networking/browsers/uzbl/default.nix

@@ -18,7 +18,15 @@ rec {
   configureFlags = [];
 
   /* doConfigure should be removed if not needed */
-  phaseNames = ["doMakeInstall"];
+  phaseNames = ["doMakeInstall" "doWrap"];
+
+  doWrap = a.makeManyWrappers "$out/bin/uzbl" 
+    ''
+      --prefix GST_PLUGIN_PATH : ${webkit.gstreamer}/lib/gstreamer-*
+      --prefix GST_PLUGIN_PATH : ${webkit.gstPluginsBase}/lib/gstreamer-*
+      --prefix GST_PLUGIN_PATH : ${webkit.gstPluginsGood}/lib/gstreamer-*
+      --prefix GST_PLUGIN_PATH : ${webkit.gstFfmpeg}/lib/gstreamer-*
+    '';
 
   installFlags = "PREFIX=$out";
       

pkgs/development/libraries/webkit/default.nix

@@ -10,7 +10,11 @@ rec {
     gettext libjpeg libpng libtiff libxml2 libxslt pango
     sqlite icu gperf bison flex autoconf automake libtool 
     perl intltool pkgconfig libsoup gtkdoc libXt libproxy
-    enchant gstreamer gstPluginsBase gstFfmpeg
+    enchant 
+    ];
+
+  propagatedBuildInputs = [
+    gstreamer gstPluginsBase gstFfmpeg gstPluginsGood
     ];
 
   configureCommand = "./autogen.sh ";

pkgs/top-level/all-packages.nix

@@ -4052,7 +4052,8 @@ let
       libjpeg libtiff libpng libxml2 libxslt sqlite
       icu cairo perl intltool automake libtool
       pkgconfig autoconf bison libproxy enchant;
-    inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg;
+    inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg
+      gstPluginsGood;
     flex = flex2535;
     inherit (xlibs) libXt;
   };