urbanterror: Update to 4.2.009.

1 files changed, 23 insertions, 47 deletions

diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix
index bffc5ad90d1..42460dd0a84 100644
--- a/pkgs/games/urbanterror/default.nix
+++ b/pkgs/games/urbanterror/default.nix
@@ -1,72 +1,48 @@
 { stdenv, fetchurl, unzip, SDL, mesa, openal, curl }:
 stdenv.mkDerivation rec {
   name = "urbanterror-${version}";
-  version = "4.1";
-  src1 = fetchurl {
-    url = "http://ftp.snt.utwente.nl/pub/games/urbanterror/UrbanTerror_41_FULL.zip";
-    sha256 = "0pr6xpwq8zllc0xsdxl8cfd0zz5fhggw5fsbrizygr6hhdvra1jp";
-  };
-  src2 = fetchurl {
-    url = "http://ftp.snt.utwente.nl/pub/games/urbanterror/iourbanterror/source/complete/ioUrbanTerrorSource_2007_12_20.zip";
-    sha256 = "1s1wq9m7shhvvk7s4400yrmz7dys501i4c9ln1mglc9dhmi8dmcn";
-  };
+  version = "4.2.009";
+  srcs =
+    [ (fetchurl {
+         url = "http://download.urbanterror.info/urt/42/zips/UrbanTerror42_full_009.zip";
+         sha256 = "0m423zy6l1z4kxz55knlh1ypnqq58ghh08i8ziv4lm00ygm6mx2i";
+       })
+      (fetchurl {
+         url = "https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-4.2.007.tar.gz";
+         sha256 = "1299j0i94697m2bbcgraxfbb7q1g6nc43l1xqlgqvcsjp799mwwn";
+       })
+    ];
   buildInputs = [ unzip SDL mesa openal curl ];
-  unpackPhase = ''
-    mkdir urbanterror
-    cd urbanterror
-    unzip $src1
-    unzip $src2
-  '';
-  patches = [ ./l_script.patch ];
-  patchPhase = ''
-    for d in ioUrbanTerrorClientSource ioUrbanTerrorServerSource
-    do
-      cd "$d"
-      patch -p 0 < "''${patches[0]}"
-      cd ..
-    done
-  '';
+  sourceRoot = "ioq3-for-UrbanTerror-4-release-4.2.007";
   configurePhase = ''
-    cd ioUrbanTerrorClientSource
     echo "USE_OPENAL = 1" > Makefile.local
     echo "USE_OPENAL_DLOPEN = 0" >> Makefile.local
     echo "USE_CURL = 1" >> Makefile.local
     echo "USE_CURL_DLOPEN = 0" >> Makefile.local
-    substituteInPlace code/tools/asm/Makefile --replace -Werror ""
-    cd ..
-  '';
-  buildPhase = ''
-    for d in ioUrbanTerrorClientSource ioUrbanTerrorServerSource
-    do
-      cd $d
-      make
-      cd ..
-    done
   '';
   installPhase = ''
     destDir="$out/opt/urbanterror"
-    mkdir -p "$destDir"
-    mkdir -p "$out/bin"
-    cp -v ioUrbanTerrorClientSource/build/release-linux-*/ioUrbanTerror.* \
-          "$destDir/ioUrbanTerror"
-    cp -v ioUrbanTerrorServerSource/build/release-linux-*/ioUrTded.* \
-          "$destDir/ioUrTded"
-    cp -rv UrbanTerror/q3ut4 "$destDir"
+    ensureDir "$destDir" "$out/bin"
+    cp -v build/release-linux-*/Quake3-UrT.* \
+          "$destDir/Quake3-UrT"
+    cp -v build/release-linux-*/Quake3-UrT-Ded.* \
+          "$destDir/Quake3-UrT-Ded"
+    cp -rv ../UrbanTerror42/q3ut4 "$destDir"
     cat << EOF > "$out/bin/urbanterror"
-    #!/bin/sh
+    #! ${stdenv.shell}
     cd "$destDir"
-    exec ./ioUrbanTerror "\$@"
+    exec ./Quake3-UrT "\$@"
     EOF
     chmod +x "$out/bin/urbanterror"
     cat << EOF > "$out/bin/urbanterror-ded"
-    #!/bin/sh
+    #! ${stdenv.shell}
     cd "$destDir"
-    exec ./ioUrTded "\$@"
+    exec ./Quake3-UrT-Ded "\$@"
     EOF
     chmod +x "$out/bin/urbanterror-ded"
   '';
   postFixup = ''
-    p=$out/opt/urbanterror/ioUrbanTerror
+    p=$out/opt/urbanterror/Quake3-UrT
     cur_rpath=$(patchelf --print-rpath $p)
     patchelf --set-rpath $cur_rpath:${mesa}/lib $p
   '';