diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix index 18a86f2d85c0..63fae5df0fcd 100644 --- a/pkgs/games/scorched3d/default.nix +++ b/pkgs/games/scorched3d/default.nix @@ -1,29 +1,34 @@ {stdenv, fetchurl, mesa, openal, autoconf, automake, libtool, freealut, wxGTK, -freetype, fftw, SDL, SDL_net, zlib, libpng, libjpeg} : +freetype, fftwSinglePrec, SDL, SDL_net, zlib, libpng, libjpeg, pkgconfig, libogg, +libvorbis} : stdenv.mkDerivation { - name = "scorched3d-42.1"; + name = "scorched3d-43.2a"; src = fetchurl { - url = mirror://sourceforge/scorched3d/Scorched3D-42.1-src.tar.gz; - sha256 = "0vhhi68ii5ldxbacsiqccsascrn3q033hnaa1ha8r9gxspzcqkl8"; + url = mirror://sourceforge/scorched3d/Scorched3D-43.2a-src.tar.gz; + sha256 = "1hv1mnfb7y51hqmg95l8rx00j66ff32ddxxi5zgfyw92hsvahgxi"; }; - buildInputs = [ mesa openal autoconf automake libtool freealut wxGTK - freetype fftw SDL SDL_net zlib libpng libjpeg ]; + buildInputs = + [ mesa openal freealut wxGTK freetype fftwSinglePrec SDL_net zlib libpng libjpeg + libogg libvorbis ]; - unpackPhase = "tar xvzf $src ; cd scorched"; + buildNativeInputs = [ pkgconfig ]; - patches = [ ./scorched3d-42.1-fixups.patch ./file-existence.patch ]; + patches = [ ./file-existence.patch ]; - preConfigure = '' - set +e - aclocal - libtoolize --copy --force - autoconf - automake - libtoolize - set -e - ''; + sourceRoot = "scorched"; + + configureFlags = "--with-fftw=${fftwSinglePrec}"; + +# Fake openal-config + preConfigure = + '' + mkdir -pv mybin + export PATH=$PATH:$PWD/mybin + echo -e "#!/bin/sh\npkg-config openal \"$@\"" > mybin/openal-config + chmod +x mybin/openal-config + ''; meta = { homepage = http://scorched3d.co.uk/; diff --git a/pkgs/games/scorched3d/scorched3d-42.1-fixups.patch b/pkgs/games/scorched3d/scorched3d-42.1-fixups.patch deleted file mode 100644 index 36a027cb60cc..000000000000 --- a/pkgs/games/scorched3d/scorched3d-42.1-fixups.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -ru scorched.orig/configure-al.m4 scorched/configure-al.m4 ---- scorched.orig/configure-al.m4 2008-03-03 16:17:18.000000000 -0500 -+++ scorched/configure-al.m4 2009-02-15 20:43:35.000000000 -0500 -@@ -7,25 +7,9 @@ - [ --disable-openaltest Do not try to compile and run a test OpenAL program], - , enable_openaltest=yes) - AC_MSG_CHECKING(for OpenAL support) --AC_PATH_PROG(OPENAL_CONFIG, openal-config, no) --if test x$OPENAL_CONFIG = xno; then -- echo "*** The openal-config script installed by OpenAL could not be found" -- echo "*** Make sure openal-config is in your path, or set the OPENAL_CONFIG" -- echo "*** environment variable to the full path to openal-config." -- -- AC_MSG_ERROR([*** Can't find the openal library. Try: http://www.openal.org/]) --else -- -- if test x"$use_static_openal" = x"yes"; then -- AL_LIBS="/usr/local/lib/libopenal.a" -- else -- AL_LIBS="`$OPENAL_CONFIG --libs`" -- fi -- -- AL_CFLAGS="`$OPENAL_CONFIG --cflags`" -- -- AC_MSG_RESULT(yes) --fi -+AL_LIBS="-lopenal" -+AL_CFLAGS="-I/usr/include/AL" -+AC_MSG_RESULT(yes) - - AC_MSG_CHECKING(for Freealut support) - AC_PATH_PROG(FREEALUT_CONFIG, freealut-config, no) -diff -ru scorched.orig/configure.ac scorched/configure.ac ---- scorched.orig/configure.ac 2008-03-03 16:17:18.000000000 -0500 -+++ scorched/configure.ac 2009-02-15 20:40:30.000000000 -0500 -@@ -13,22 +13,6 @@ - AC_PROG_INSTALL - AC_PROG_RANLIB - --LDFLAGS="-L/usr/X11R6/lib -L/usr/X11R6" --CPPFLAGS="-I/usr/X11R6/include -I/usr/X11R6" -- --if test `uname` == Darwin; then --LDFLAGS="$LDFLAGS -lmx" --CPPFLAGS="$CPPFLAGS -DFFTW_USE_DOUBLE -D__DARWIN__ -D__MACOSX__" --else --LDFLAGS="$LDFLAGS -L/usr/local/lib" --CPPFLAGS="$CPPFLAGS -I/usr/local/include" --fi -- --AC_CHECK_LIB(fridge, beer, echo "Hmm?!",[ -- echo "Warning: No beer found in fridge!"; -- echo "We highly suggest that you rectify this situation immediately." --]) -- - AC_ARG_ENABLE(serveronly, - [ --enable-serveronly Enable server only compilation], - , enable_serveronly=no, diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index efd27b13a139..ebef833c06c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7671,7 +7671,6 @@ let scummvm = callPackage ../games/scummvm { }; scorched3d = callPackage ../games/scorched3d { - wxGTK = wxGTK26; }; sgtpuzzles = builderDefsPackage (import ../games/sgt-puzzles) {