* ioquake: updated to 1.34rc3.

* rss-glx: fixed the build.
* Removed the OpenGL wrapper stuff, it's no longer needed (thanks to
  the RUNPATH you just need to put the appropriate libGL.so in the
  LD_LIBRARY_PATH). 

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

pkgs/misc/screensavers/rss-glx/default.nix

@@ -1,16 +1,16 @@
-{stdenv, fetchurl, x11, mesa}:
+{stdenv, fetchurl, x11, mesa, pkgconfig, imagemagick, libtiff, bzip2}:
 
 stdenv.mkDerivation {
   name = "rss-glx-0.8.1";
-  builder = ./builder.sh;
+  
+  #builder = ./builder.sh;
 
   src = fetchurl {
     url = mirror://sourceforge/rss-glx/rss-glx_0.8.1.tar.bz2;
     md5 = "a2bdf0e10ee4e89c8975f313c5c0ba6f";
   };
 
-  buildInputs = [x11 mesa];
-  inherit mesa;
-  
-  mesaSwitch = ../../../build-support/opengl/mesa-switch.sh;
+  buildInputs = [x11 mesa pkgconfig imagemagick libtiff bzip2];
+
+  NIX_CFLAGS_COMPILE = "-I${imagemagick}/include/ImageMagick";
 }