summary refs log tree commit diff
path: root/pkgs/games
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2012-01-26 15:27:03 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2012-01-26 15:27:03 +0000
commit5b132f6e96a9794018ae1c085da482b381d1e039 (patch)
treeff54ae514799540c093adcfeca0d501b75cde506 /pkgs/games
parentf878980c8b78a639b3feabd1f8f9ed9f1b7c388c (diff)
parentd9de74edd67f7dc31f5297bc785712afb322dbdd (diff)
downloadnixlib-5b132f6e96a9794018ae1c085da482b381d1e039.tar
nixlib-5b132f6e96a9794018ae1c085da482b381d1e039.tar.gz
nixlib-5b132f6e96a9794018ae1c085da482b381d1e039.tar.bz2
nixlib-5b132f6e96a9794018ae1c085da482b381d1e039.tar.lz
nixlib-5b132f6e96a9794018ae1c085da482b381d1e039.tar.xz
nixlib-5b132f6e96a9794018ae1c085da482b381d1e039.tar.zst
nixlib-5b132f6e96a9794018ae1c085da482b381d1e039.zip
svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
Diffstat (limited to 'pkgs/games')
-rw-r--r--pkgs/games/torcs/default.nix10
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix
index 7f7c95d3cd18..cf740def5116 100644
--- a/pkgs/games/torcs/default.nix
+++ b/pkgs/games/torcs/default.nix
@@ -1,13 +1,13 @@
 { fetchurl, stdenv, mesa, freeglut, libX11, plib, openal, freealut, libXrandr, xproto,
-libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm,
+libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, libvorbis,
 libpng, zlib, bash }:
 
 stdenv.mkDerivation rec {
-  name = "torcs-1.3.1";
+  name = "torcs-1.3.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/torcs/${name}.tar.bz2";
-    sha256 = "1zai7nrx93pcv24r3fkr08831szj7vz3a6xy8fihlv6wvfnpn6wh";
+    sha256 = "0171ixhnd9cs8jkwa5awrxklfgyykcbc9m8270b8cw30lsx7qhp1";
   };
 
   patchPhase = ''
@@ -15,7 +15,9 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [ mesa freeglut libX11 plib openal freealut libXrandr xproto
-    libXext libSM libICE libXi libXt libXrender libXxf86vm libpng zlib bash ];
+    libXext libSM libICE libXi libXt libXrender libXxf86vm libpng zlib libvorbis ];
+
+  buildNativeInputs = [ bash ];
 
   installTargets = "install datainstall";