From 6c7b2081a793b2d988a609a478752bc40e477c93 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Mon, 22 May 2017 04:34:11 -0700
Subject: [PATCH] gzdoom: 2.3.2 -> 3.0.1
also change license to gpl3, gzdoom migrated licenses! (yay)
---
pkgs/games/gzdoom/default.nix | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix
index b485c806352..6e1a98bf258 100644
--- a/pkgs/games/gzdoom/default.nix
+++ b/pkgs/games/gzdoom/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "gzdoom-${version}";
- version = "2.3.2";
+ version = "3.0.1";
src = fetchFromGitHub {
owner = "coelckers";
repo = "gzdoom";
rev = "g${version}";
- sha256 = "1ys7wl4ygvm2lm49qjpql6c5i8gydmbg4f436bcpkywf5srr6xrd";
+ sha256 = "0s0hl7pa2gr3cm884q7np5naybhv4hqhbfd3s45a8hdf72n6c9cm";
};
nativeBuildInputs = [ cmake makeWrapper ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
sed -i \
-e "s@/usr/share/sounds/sf2/@${soundfont-fluid}/share/soundfonts/@g" \
-e "s@FluidR3_GM.sf2@FluidR3_GM2-2.sf2@g" \
- src/sound/music_fluidsynth_mididevice.cpp
+ src/sound/mididevices/music_fluidsynth_mididevice.cpp
'';
installPhase = ''
@@ -42,8 +42,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = "https://github.com/coelckers/gzdoom";
description = "A Doom source port based on ZDoom. It features an OpenGL renderer and lots of new features";
- # Doom source license, MAME license
- license = licenses.unfreeRedistributable;
+ license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ lassulus ];
};