From 45f51f05b817777a30881801fcd133d16d4cb09d Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sun, 29 Jan 2017 23:46:27 -0800
Subject: [PATCH] dhewm3: 20130113 -> 1.4.1
---
pkgs/games/dhewm3/default.nix | 33 +++++++++++++++++++--------------
1 file changed, 19 insertions(+), 14 deletions(-)
diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/games/dhewm3/default.nix
index e3efd84f0fb..4bae8e1d58a 100644
--- a/pkgs/games/dhewm3/default.nix
+++ b/pkgs/games/dhewm3/default.nix
@@ -1,33 +1,38 @@
-{stdenv, fetchurl, unzip, cmake, SDL, mesa, zlib, libjpeg, libogg, libvorbis
+{ stdenv, fetchFromGitHub, cmake, SDL2, mesa, zlib, libjpeg, libogg, libvorbis
, openal, curl }:
stdenv.mkDerivation rec {
- hash = "92a41322f4aa8bd45395d8088721c9a2bf43c79b";
- name = "dhewm3-20130113-${hash}";
- src = fetchurl {
- url = "https://github.com/dhewm/dhewm3/zipball/${hash}";
- sha256 = "0c17k60xhimpqi1xi9s1l7jbc97pqjnk4lgwyjb0agc3dkr73zwd";
+ name = "dhewm3-${version}";
+ version = "1.4.1";
+
+ src = fetchFromGitHub {
+ owner = "dhewm";
+ repo = "dhewm3";
+ rev = version;
+ sha256 = "1s64xr1ir4d2z01fhldy577b0x80nd1k6my7y1hxp57lggr8dy5y";
};
# Add mesa linking
patchPhase = ''
- sed -i 's/\<idlib\()\?\)$/idlib GL\1/' CMakeLists.txt
+ sed -i 's/\<idlib\()\?\)$/idlib GL\1/' neo/CMakeLists.txt
'';
- unpackPhase = ''
- unzip ${src}
- cd */neo
+ preConfigure = ''
+ cd "$(ls -d dhewm3-*.src)"/neo
'';
- buildInputs = [ unzip cmake SDL mesa zlib libjpeg libogg libvorbis openal
- curl ];
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ SDL2 mesa zlib libjpeg libogg libvorbis openal curl ];
enableParallelBuilding = true;
- meta = {
+ hardeningDisable = [ "format" ];
+
+ meta = with stdenv.lib; {
homepage = https://github.com/dhewm/dhewm3;
description = "Doom 3 port to SDL";
license = stdenv.lib.licenses.gpl3;
+ maintainers = with maintainers; [ MP2E ];
+ platforms = with platforms; linux;
};
-
}