nixpkgs dir: nvidia and libsrvg

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

pkgs/applications/window-managers/compiz/default.nix

@@ -1,6 +1,9 @@
 { stdenv, fetchurl, pkgconfig, libpng, libXcomposite, libXfixes
 , libXdamage, libXrandr, libXinerama, libICE, libSM
 , startupnotification, libXrender, xextproto, mesa, gtk, libwnck, GConf
+, libgnome, libgnomeui, metacity
+, gnomegtk, glib, pango, libglade, libgtkhtml, gtkhtml, libgnomecanvas, libgnomeprint, libgnomeprintui, gnomepanel
+, librsvg, fuse
 }:
 
 stdenv.mkDerivation {
@@ -13,11 +16,18 @@ stdenv.mkDerivation {
     ./tfp-server-extension.patch
   ];
   buildInputs = [
-    pkgconfig libXrender xextproto gtk libwnck GConf
+    pkgconfig libXrender xextproto gtk libwnck GConf libgnome libgnomeui metacity gnomegtk glib pango libglade libgtkhtml gtkhtml libgnomecanvas libgnomeprint libgnomeprintui gnomepanel librsvg fuse
   ];
   propagatedBuildInputs = [
     libpng libXcomposite libXfixes libXdamage libXrandr libXinerama
-    libICE libSM startupnotification mesa
+    libICE libSM startupnotification mesa GConf
   ];
-  configureFlags = "--enable-gtk";
+  configureFlags = "--enable-gtk --enable-fuse --enable-annotate --enable-librsvg";
+
+  postFixup = "
+    for i in $out/bin/*; do
+     patchelf --set-rpath /var/state/opengl-driver/lib:$(patchelf --print-rpath $i) $i
+    done
+  ";
+
 }

pkgs/applications/window-managers/compiz/extra.nix

@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   name = "compiz-extra-20070305";
   src = fetchurl {
     url = http://gandalfn.club.fr/ubuntu/compiz-extra/compiz-extra-latest.tar.bz2;
-    sha256 = "1cm5cayhpnlhj0fhg8lqghdk52h9gmv4jv98zzadj3r3fd8mwr9z";
+    sha256 = "7fc7faafccfdf22dea7ac1de6629dcb55ec63d84fcb57a14559309cf284fa94f";
   };
   buildInputs = [
     pkgconfig compiz perl perlXMLParser GConf dbus gtk