* Fixes for a52dec and mpeg2dec to make vlc build on x86_64-linux.
* Fixes to make par2cmdline and exult build on gcc 4.x, since gcc 3.4.x doesn't seem to work on x86_64-linux (NIXPKGS-91). * Disabled pidgin on x86_64-linux because it needs a dynamic libperl which we don't have right now. * Disabled wine on x86_64-linux because we still lack -m32 support. svn path=/nixpkgs/trunk/; revision=12187
This commit is contained in:
@@ -9,6 +9,14 @@ stdenv.mkDerivation {
|
||||
md5 = "0fc88dee74a91724d25373ba0a8670ba";
|
||||
};
|
||||
|
||||
# Patches for building on x86_64 and gcc 4.x.
|
||||
patches = [
|
||||
(fetchurl {
|
||||
url = "http://www.rocklinux.net/sources/package/stf/exult/exult-gcc4.patch";
|
||||
sha256 = "1jlikxcpsi3yfchan3jbyi66fcyr18m7kfmsa946lwh3kzckszm7";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [SDL SDL_mixer zlib libpng unzip];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${SDL_mixer}/include/SDL";
|
||||
@@ -24,9 +32,10 @@ stdenv.mkDerivation {
|
||||
url = mirror://sourceforge/exult/U7MusicOGG_2of2.zip;
|
||||
md5 = "cdae5956d7c52f35e90317913a660123";
|
||||
})
|
||||
];
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = http://exult.sourceforge.net/;
|
||||
description = "A reimplementation of the Ultima VII game engine";
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user