diff options
| author | Alexandre-Xavier Labonté-Lamoureux <alexandrexavier@live.ca> | 2020-04-24 02:12:05 -0400 |
|---|---|---|
| committer | Cray Elliott <MP2E@archlinux.us> | 2020-04-24 18:21:25 -0700 |
| commit | 134f200cef170024748930e3a581017055ea0dde (patch) | |
| tree | 9085d393116398973adef46c3a93f7de18dc2394 | |
| parent | 594b74c47629b9ca6cd9e16e7e90fc77a1a853d0 (diff) | |
chocolate-doom: 2.3.0 -> 3.0.0
| -rw-r--r-- | pkgs/games/chocolate-doom/default.nix | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/pkgs/games/chocolate-doom/default.nix b/pkgs/games/chocolate-doom/default.nix index 7eef6b5dff81..1c2a24de01dd 100644 --- a/pkgs/games/chocolate-doom/default.nix +++ b/pkgs/games/chocolate-doom/default.nix @@ -1,17 +1,22 @@ -{ stdenv, autoreconfHook, pkgconfig, SDL, SDL_mixer, SDL_net, fetchurl }: +{ stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "chocolate-doom-2.3.0"; - src = fetchurl { - url = "https://github.com/chocolate-doom/chocolate-doom/archive/${name}.tar.gz"; - sha256 = "0i57smxmbhxj0wgvxq845ba9zsn5nx5wmzkl71rdchyd4q5jmida"; + pname = "chocolate-doom"; + version = "3.0.0"; + + src = fetchFromGitHub { + owner = "chocolate-doom"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "0ajzb767wyj8vzhjpsmgslw42b0155ji4alk26shxl7k5ijbzn0j"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ SDL SDL_mixer SDL_net ]; - patchPhase = '' + + postPatch = '' sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am ''; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ SDL2 SDL2_mixer SDL2_net ]; enableParallelBuilding = true; meta = { |