* 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/games/quake3/wrapper/builder.sh

@@ -1,6 +1,5 @@
 source $stdenv/setup
 
-
 ensureDir $out/baseq3
 for i in $paks; do
     if test -d "$paks/baseq3"; then
@@ -8,20 +7,9 @@ for i in $paks; do
     fi
 done
 
-
-ensureDir $out/bin
-
-cat >$out/bin/quake3 <<EOF
-#! $SHELL -e
-
-mesa=$mesa
-
-$(cat $mesaSwitch)
-
-exec $game/ioquake3.i386 \
-    +set fs_basepath $out \
-    +set r_allowSoftwareGL 1 \
-    "\$@"
-EOF
-
-chmod +x $out/bin/quake3
+# We add Mesa to the end of $LD_LIBRARY_PATH to provide fallback
+# software rendering.  GCC is needed so that libgcc_s.so can be found
+# when Mesa is used.
+makeWrapper $game/ioquake3.i386 $out/bin/quake3 \
+    --suffix-each LD_LIBRARY_PATH ':' "$mesa/lib $gcc/lib" \
+    --add-flags "+set fs_basepath $out +set r_allowSoftwareGL 1"

pkgs/games/quake3/wrapper/default.nix

@@ -1,11 +1,14 @@
-{stdenv, fetchurl, game, paks, mesa, name, description}:
+{stdenv, fetchurl, game, paks, mesa, name, description, makeWrapper}:
 
 stdenv.mkDerivation {
   builder = ./builder.sh;
-  inherit game paks mesa name;
-  
-  mesaSwitch = ../../../build-support/opengl/mesa-switch.sh;
 
+  buildInputs = [makeWrapper];
+  
+  inherit game paks mesa name;
+
+  gcc = stdenv.gcc.gcc;
+  
   meta = {
     inherit description;
   };