summary refs log tree commit diff
path: root/pkgs/games/zandronum
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2015-06-29 17:14:15 +0200
committerCray Elliott <MP2E@archlinux.us>2015-07-03 23:30:52 -0700
commitf3bd64120392a63c14de512f06adc2284e10c617 (patch)
tree58652bc7655d5727f645376f54db6e67136487e4 /pkgs/games/zandronum
parente2136f6fecc4fa3d91263b6a45034e667ce8a3b4 (diff)
downloadnixpkgs-f3bd64120392a63c14de512f06adc2284e10c617.tar
nixpkgs-f3bd64120392a63c14de512f06adc2284e10c617.tar.gz
nixpkgs-f3bd64120392a63c14de512f06adc2284e10c617.tar.bz2
nixpkgs-f3bd64120392a63c14de512f06adc2284e10c617.tar.lz
nixpkgs-f3bd64120392a63c14de512f06adc2284e10c617.tar.xz
nixpkgs-f3bd64120392a63c14de512f06adc2284e10c617.tar.zst
nixpkgs-f3bd64120392a63c14de512f06adc2284e10c617.zip
zandronum: 2.0 -> 2.1
Diffstat (limited to 'pkgs/games/zandronum')
-rw-r--r--pkgs/games/zandronum/bin.nix8
-rw-r--r--pkgs/games/zandronum/default.nix8
-rw-r--r--pkgs/games/zandronum/server.nix8
3 files changed, 13 insertions, 11 deletions
diff --git a/pkgs/games/zandronum/bin.nix b/pkgs/games/zandronum/bin.nix
index baf91a66622..f7fa9fc643e 100644
--- a/pkgs/games/zandronum/bin.nix
+++ b/pkgs/games/zandronum/bin.nix
@@ -3,6 +3,7 @@
 , bzip2
 , cairo
 , fetchurl
+, fluidsynth
 , fontconfig
 , freetype
 , gdk_pixbuf
@@ -20,16 +21,17 @@
 assert stdenv.system == "x86_64-linux";
 
 stdenv.mkDerivation rec {
-  name = "zandronum-2.0";
+  name = "zandronum-2.1";
   src = fetchurl {
-    url = "http://zandronum.com/downloads/zandronum2.0-linux-x86_64.tar.bz2";
-    sha256 = "1k49az7x0ig40r2xisscpyhfcx9zzivx8w1l1ispj58g6qivicgc";
+    url = "http://zandronum.com/downloads/zandronum2.1-linux-x86_64.tar.bz2";
+    sha256 = "0fhk2gd0lqmc6brbli17ks5ywnlzkjyas1kfdqsf3d96w0z5rz11";
   };
 
   libPath = stdenv.lib.makeLibraryPath [
     atk
     bzip2
     cairo
+    fluidsynth
     fontconfig
     freetype
     gdk_pixbuf
diff --git a/pkgs/games/zandronum/default.nix b/pkgs/games/zandronum/default.nix
index ca60c364f0f..812ea268113 100644
--- a/pkgs/games/zandronum/default.nix
+++ b/pkgs/games/zandronum/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchhg, cmake, SDL, mesa, fmod42416, openssl, sqlite, sqlite-amalgamation }:
 
 stdenv.mkDerivation {
-  name = "zandronum-2.0";
+  name = "zandronum-2.1";
   src = fetchhg {
-    url = "https://bitbucket.org/Torr_Samaho/zandronum";
-    rev = "2fc02c0";
-    sha256 = "1syzy0iphm6jj5wag3xyr2fx7vyg2cjcmijhvgw2rc67rww85pv2";
+    url = "https://bitbucket.org/Torr_Samaho/zandronum-stable";
+    rev = "27275a8";
+    sha256 = "00xyrk0d1jrvy6zk059yawgd9b33z0fx4hvzcjvvbn03rqci60yc";
   };
 
   phases = [ "unpackPhase" "configurePhase" "buildPhase" "installPhase" ];
diff --git a/pkgs/games/zandronum/server.nix b/pkgs/games/zandronum/server.nix
index 506eee0e54f..f0e0285f87e 100644
--- a/pkgs/games/zandronum/server.nix
+++ b/pkgs/games/zandronum/server.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchhg, cmake, openssl, sqlite, sqlite-amalgamation, SDL }:
 
 stdenv.mkDerivation {
-  name = "zandronum-server-2.0";
+  name = "zandronum-server-2.1";
   src = fetchhg {
-    url = "https://bitbucket.org/Torr_Samaho/zandronum";
-    rev = "2fc02c0";
-    sha256 = "1syzy0iphm6jj5wag3xyr2fx7vyg2cjcmijhvgw2rc67rww85pv2";
+    url = "https://bitbucket.org/Torr_Samaho/zandronum-stable";
+    rev = "27275a8";
+    sha256 = "00xyrk0d1jrvy6zk059yawgd9b33z0fx4hvzcjvvbn03rqci60yc";
   };
 
   phases = [ "unpackPhase" "configurePhase" "buildPhase" "installPhase" ];