about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2008-06-14 20:55:48 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2008-06-14 20:55:48 +0000
commit7219a09001291ef236ad8ac02713096bec0d0c08 (patch)
treef14a36e929e646e9977f3f4bbccd64b6d1516860 /pkgs/top-level
parent80b2254cbb90bfb93dbe1bb5a58866db68e17ae4 (diff)
downloadnixlib-7219a09001291ef236ad8ac02713096bec0d0c08.tar
nixlib-7219a09001291ef236ad8ac02713096bec0d0c08.tar.gz
nixlib-7219a09001291ef236ad8ac02713096bec0d0c08.tar.bz2
nixlib-7219a09001291ef236ad8ac02713096bec0d0c08.tar.lz
nixlib-7219a09001291ef236ad8ac02713096bec0d0c08.tar.xz
nixlib-7219a09001291ef236ad8ac02713096bec0d0c08.tar.zst
nixlib-7219a09001291ef236ad8ac02713096bec0d0c08.zip
* 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
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8bc6195bb02c..b5c0a3872d19 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6758,9 +6758,9 @@ let pkgs = rec {
   };
 
   quake3demo = import ../games/quake3/wrapper {
-    name = "quake3-demo";
+    name = "quake3-demo-${quake3game.name}";
     description = "Demo of Quake 3 Arena, a classic first-person shooter";
-    inherit fetchurl stdenv mesa;
+    inherit fetchurl stdenv mesa makeWrapper;
     game = quake3game;
     paks = [quake3demodata];
   };
@@ -7078,7 +7078,7 @@ let pkgs = rec {
   };
 
   rssglx = import ../misc/screensavers/rss-glx {
-    inherit fetchurl stdenv x11 mesa;
+    inherit fetchurl stdenv x11 mesa pkgconfig imagemagick libtiff bzip2;
   };
 
   xlockmore = import ../misc/screensavers/xlockmore {
@@ -7116,7 +7116,7 @@ let pkgs = rec {
   */
 
   texFunctions = import ../misc/tex/nix {
-    inherit stdenv perl tetex graphviz ghostscript imagemagick;
+    inherit stdenv perl tetex graphviz ghostscript;
   };
 
   texLiveFun = builderDefsPackage (import ../misc/tex/texlive) {