games/tremulous: Removed rust.

svn path=/nixpkgs/trunk/; revision=31282
This commit is contained in:
Alexander Tsamutali 2012-01-04 16:46:25 +00:00
parent 3ca6582874
commit 3b4451ade5
2 changed files with 29 additions and 1 deletions

View file

@ -25,6 +25,12 @@ stdenv.mkDerivation rec {
tar xvf $src3
cd ..
'';
patches = [ ./parse.patch ];
patchFlags = "-p 0";
NIX_LD_FLAGS = ''
-rpath ${stdenv.gcc}/lib
-rpath ${stdenv.gcc}/lib64
'';
buildPhase = ''
cd Release_1.011
make
@ -45,11 +51,12 @@ stdenv.mkDerivation rec {
cat << EOF > $out/bin/$b
#!/bin/sh
cd $out/opt/tremulous
./$b.$arch "$@"
exec ./$b.$arch "\$@"
EOF
chmod +x $out/bin/$b
done
'';
dontPatchELF = true;
meta = {
description = "A game that blends a team based FPS with elements of an RTS";
longDescription = ''

View file

@ -0,0 +1,21 @@
diff -ruN Release_1.011-old/src/qcommon/parse.c Release_1.011/src/qcommon/parse.c
--- Release_1.011-old/src/qcommon/parse.c 2011-12-02 19:11:49.307368651 -0500
+++ Release_1.011/src/qcommon/parse.c 2011-12-02 19:13:27.556836387 -0500
@@ -981,7 +981,7 @@
{
if (*string == '\"')
{
- strcpy(string, string+1);
+ memmove(string, string+1, strlen(string));
}
if (string[strlen(string)-1] == '\"')
{
@@ -1784,7 +1784,7 @@
if ((*ptr == '\\' || *ptr == '/') &&
(*(ptr+1) == '\\' || *(ptr+1) == '/'))
{
- strcpy(ptr, ptr+1);
+ memmove(ptr, ptr+1, strlen(ptr));
}
else
{