* Really fix Exult on x86_64 now.
svn path=/nixpkgs/trunk/; revision=12188
This commit is contained in:
parent
677be83122
commit
df50191ff5
21
pkgs/games/exult/64bits.patch
Normal file
21
pkgs/games/exult/64bits.patch
Normal file
|
@ -0,0 +1,21 @@
|
|||
diff -ru exult-1.2-orig/usecode/useval.cc exult-1.2/usecode/useval.cc
|
||||
--- exult-1.2-orig/usecode/useval.cc 2004-05-23 07:07:11.000000000 +0200
|
||||
+++ exult-1.2/usecode/useval.cc 2008-06-25 17:27:15.000000000 +0200
|
||||
@@ -464,7 +464,7 @@
|
||||
if (buflen < 5)
|
||||
return -1;
|
||||
*ptr++ = type;
|
||||
- Write4(ptr, (int)value.ptr);
|
||||
+ Write4(ptr, 0);
|
||||
break;
|
||||
case string_type:
|
||||
{
|
||||
@@ -525,7 +525,7 @@
|
||||
case pointer_type:
|
||||
if (buflen < 5)
|
||||
return false;
|
||||
- value.ptr = (Game_object*)Read4(ptr); //DON'T dereference this pointer!
|
||||
+ value.ptr = 0; //DON'T dereference this pointer!
|
||||
// Maybe add a new type "serialized_pointer" to prevent "accidents"?
|
||||
return true;
|
||||
case string_type:
|
|
@ -15,6 +15,9 @@ stdenv.mkDerivation {
|
|||
url = "http://www.rocklinux.net/sources/package/stf/exult/exult-gcc4.patch";
|
||||
sha256 = "1jlikxcpsi3yfchan3jbyi66fcyr18m7kfmsa946lwh3kzckszm7";
|
||||
})
|
||||
|
||||
# From http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/games-engines/exult/files/exult-1.2-64bits.patch?rev=1.1
|
||||
./64bits.patch
|
||||
];
|
||||
|
||||
buildInputs = [SDL SDL_mixer zlib libpng unzip];
|
||||
|
|
Loading…
Reference in a new issue