cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

gzdoom: 4.7.1 -> 4.8.2

Browse source 
Fixes: #189159
This commit is contained in:
Azat Bahawi 2022-09-01 20:32:41 +03:00
parent cc5f7c2f3d
commit c648a1d168
No known key found for this signature in database
GPG key ID: C8C6BDDB3847F72B
1 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
pkgs/games/gzdoom/default.nix
View file

@ -1,19 +1,18 @@
{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, openal, fluidsynth { lib, stdenv, fetchFromGitHub, cmake, makeWrapper, openal, fluidsynth
, soundfont-fluid, libGL, SDL2, bzip2, zlib, libjpeg, libsndfile, mpg123 , soundfont-fluid, libGL, SDL2, bzip2, zlib, libjpeg, libsndfile, libvpx, mpg123
, game-music-emu, pkg-config, copyDesktopItems, makeDesktopItem }: , game-music-emu, pkg-config, copyDesktopItems, makeDesktopItem }:
let let
zmusic-src = fetchFromGitHub { zmusic = stdenv.mkDerivation rec {
owner = "coelckers";
repo = "zmusic";
rev = "bff02053bea30bd789e45f60b90db3ffc69c8cc8";
sha256 = "0vpr79gpdbhslg5qxyd1qxlv5akgli26skm1vb94yd8v69ymdcy2";
};
zmusic = stdenv.mkDerivation {
pname = "zmusic"; pname = "zmusic";
version = "1.1.3"; version = "1.1.3";
src = zmusic-src; src = fetchFromGitHub {
owner = "ZDoom";
repo = "ZMusic";
rev = version;
hash = "sha256-wrNWfTIbNU/S2qFObUSkb6qyaceh+Y7Loxqudl86+W4=";
};
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
@ -23,18 +22,17 @@ let
-e "s@FluidR3_GM.sf2@FluidR3_GM2-2.sf2@g" \ -e "s@FluidR3_GM.sf2@FluidR3_GM2-2.sf2@g" \
source/mididevices/music_fluidsynth_mididevice.cpp source/mididevices/music_fluidsynth_mididevice.cpp
''; '';
}; };
gzdoom = stdenv.mkDerivation rec { gzdoom = stdenv.mkDerivation rec {
pname = "gzdoom"; pname = "gzdoom";
version = "4.7.1"; version = "4.8.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "coelckers"; owner = "ZDoom";
repo = "gzdoom"; repo = "gzdoom";
rev = "g${version}"; rev = "g${version}";
sha256 = "sha256-3wO83RgxzeJnoxykKQxb1S1GA6QZlhZMw6GrV3YEm/0="; hash = "sha256-aT7DUZih3EDqncaXYIPIyGsz4fI267N29PmN3qyVjyo=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -48,6 +46,7 @@ let
zlib zlib
libjpeg libjpeg
libsndfile libsndfile
libvpx
mpg123 mpg123
game-music-emu game-music-emu
zmusic zmusic
@ -84,13 +83,11 @@ let
''; '';
meta = with lib; { meta = with lib; {
homepage = "https://github.com/coelckers/gzdoom"; homepage = "https://github.com/ZDoom/gzdoom";
description = description = "A Doom source port based on ZDoom. It features an OpenGL renderer and lots of new features";
"A Doom source port based on ZDoom. It features an OpenGL renderer and lots of new features"; license = licenses.gpl3Plus;
license = licenses.gpl3;
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ lassulus ]; maintainers = with maintainers; [ azahi lassulus ];
}; };
}; };
in gzdoom in gzdoom