scorched3d: 43.2a -> 44

1 files changed, 16 insertions, 20 deletions

diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix
index cf55bcd597e..3a32e12101c 100644
--- a/pkgs/games/scorched3d/default.nix
+++ b/pkgs/games/scorched3d/default.nix
@@ -1,17 +1,18 @@
-{stdenv, fetchurl, mesa, openal, autoconf, automake, libtool, freealut, wxGTK,
-freetype, fftwSinglePrec, SDL, SDL_net, zlib, libpng, libjpeg, pkgconfig, libogg,
-libvorbis} :
+{ stdenv, fetchurl, mesa, glew, pkgconfig, openalSoft, freealut, wxGTK, libogg
+, freetype, libvorbis, fftwSinglePrec, SDL, SDL_net, expat, libjpeg, libpng }:
 
-stdenv.mkDerivation {
-  name = "scorched3d-43.2a";
+stdenv.mkDerivation rec {
+  version = "44";
+  name = "scorched3d-${version}";
   src = fetchurl {
-    url = mirror://sourceforge/scorched3d/Scorched3D-43.2a-src.tar.gz;
-    sha256 = "1hv1mnfb7y51hqmg95l8rx00j66ff32ddxxi5zgfyw92hsvahgxi";
+    url = "mirror://sourceforge/scorched3d/Scorched3D-${version}-src.tar.gz";
+    sha256 = "1fldi9pn7cz6hc9h70pacgb7sbykzcac44yp3pkhn0qh4axj10qw";
   };
 
   buildInputs =
-    [ mesa openal freealut wxGTK freetype fftwSinglePrec SDL_net zlib libpng libjpeg
-    libogg libvorbis ];
+    [ mesa glew openalSoft freealut wxGTK libogg freetype libvorbis
+      SDL SDL_net expat libjpeg libpng
+    ];
 
   nativeBuildInputs = [ pkgconfig ];
 
@@ -19,20 +20,15 @@ stdenv.mkDerivation {
 
   sourceRoot = "scorched";
 
-  configureFlags = "--with-fftw=${fftwSinglePrec}";
+  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
-    '';
+  NIX_LDFLAGS = [ "-lopenal" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://scorched3d.co.uk/;
     description = "3D Clone of the classic Scorched Earth";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux; # maybe more
+    maintainers = with maintainers; [ abbradar ];
   };
 }