diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index 59851eda25aa..b9b08433a626 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -1,15 +1,16 @@ { stdenv, fetchurl, cmake, alsaLib }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { #The current release is still in a testing phase, though it should be stable # (neither the ABI or API will break). Please try it out and let me know how it # works. :-) - name = "openal-soft-1.1.93"; + version = "1.15.1"; + name = "openal-soft-${version}"; src = fetchurl { - url = http://kcat.strangesoft.net/openal-releases/openal-soft-1.1.93.tar.bz2; - sha256 = "162nyv4jy6qzi7s5q3wpdawfph6npyn1n4wjf21haxdxq0mmp6l7"; + url = "http://kcat.strangesoft.net/openal-releases/${name}.tar.bz2"; + sha256 = "0mmhdqiyb3c9dzvxspm8h2v8jibhi8pfjxnf6m0wn744y1ia2a8f"; }; buildInputs = [ cmake alsaLib ]; diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/games/dhewm3/default.nix new file mode 100644 index 000000000000..38b9f35e488c --- /dev/null +++ b/pkgs/games/dhewm3/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchurl, unzip, cmake, SDL, mesa, zlib, libjpeg, libogg, libvorbis +, openalSoft, curl }: + +stdenv.mkDerivation rec { + hash = "92a41322f4aa8bd45395d8088721c9a2bf43c79b"; + name = "dhewm3-20130113-${hash}"; + src = fetchurl { + url = "https://github.com/dhewm/dhewm3/zipball/${hash}"; + sha256 = "0c17k60xhimpqi1xi9s1l7jbc97pqjnk4lgwyjb0agc3dkr73zwd"; + }; + + unpackPhase = '' + unzip ${src} + cd */neo + ''; + + buildInputs = [ unzip cmake SDL mesa zlib libjpeg libogg libvorbis openalSoft + curl ]; + + meta = { + homepage = https://github.com/dhewm/dhewm3; + description = "Doom 3 port to SDL"; + license = "GPLv3"; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd3316821c36..7b3fc7cbd521 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8214,6 +8214,8 @@ let crrcsim = callPackage ../games/crrcsim {}; + dhewm3 = callPackage ../games/dhewm3 {}; + drumkv1 = callPackage ../applications/audio/drumkv1 { }; dwarf_fortress = callPackage_i686 ../games/dwarf-fortress { };