From 53b8411c7a0b71aa33f9c595828a0ac829c3ee78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 22 Aug 2010 14:18:58 +0000 Subject: [PATCH] Adding torcs svn path=/nixpkgs/trunk/; revision=23354 --- pkgs/development/libraries/plib/default.nix | 5 +++- pkgs/games/torcs/default.nix | 29 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 pkgs/games/torcs/default.nix diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/development/libraries/plib/default.nix index 33b940f7718..679db72802c 100644 --- a/pkgs/development/libraries/plib/default.nix +++ b/pkgs/development/libraries/plib/default.nix @@ -1,5 +1,6 @@ { fetchurl, stdenv, mesa, freeglut, SDL -, libXi, libSM, libXmu, libXext, libX11 }: +, libXi, libSM, libXmu, libXext, libX11, +enablePIC ? false }: stdenv.mkDerivation rec { name = "plib-1.8.5"; @@ -10,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0cha71mflpa10vh2l7ipyqk67dq2y0k5xbafwdks03fwdyzj4ns8"; }; + NIX_CFLAGS_COMPILE = if (enablePIC) then "-fPIC" else ""; + propagatedBuildInputs = [ mesa freeglut SDL diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix new file mode 100644 index 00000000000..7f7c95d3cd1 --- /dev/null +++ b/pkgs/games/torcs/default.nix @@ -0,0 +1,29 @@ +{ fetchurl, stdenv, mesa, freeglut, libX11, plib, openal, freealut, libXrandr, xproto, +libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, +libpng, zlib, bash }: + +stdenv.mkDerivation rec { + name = "torcs-1.3.1"; + + src = fetchurl { + url = "mirror://sourceforge/torcs/${name}.tar.bz2"; + sha256 = "1zai7nrx93pcv24r3fkr08831szj7vz3a6xy8fihlv6wvfnpn6wh"; + }; + + patchPhase = '' + sed -i -e s,/bin/bash,`type -P bash`, src/linux/torcs.in + ''; + + buildInputs = [ mesa freeglut libX11 plib openal freealut libXrandr xproto + libXext libSM libICE libXi libXt libXrender libXxf86vm libpng zlib bash ]; + + installTargets = "install datainstall"; + + meta = { + description = "Car racing game"; + homepage = http://torcs.sourceforge.net/; + license = "GPLv2+"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c923790b02..8c3415d33e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6507,6 +6507,12 @@ let tremulous = callPackage ../games/tremulous { }; + torcs = callPackage ../games/torcs { + # Torcs wants to make shared libraries linked with plib libraries (it provides static). + # i686 is the only platform I know than can do that linking without plib built with -fPIC + plib = plib.override { enablePIC = if stdenv.isi686 then false else true; }; + }; + ultimatestunts = callPackage ../games/ultimatestunts { }; urbanterror = callPackage ../games/urbanterror { };