Merge pull request #141517 from sternenseemann/gzdoom-fluidsynth-2
gzdoom: 4.5.0 -> 4.7.0; build with fluidsynth 2
This commit is contained in:
commit
60c02e9795
1 changed files with 4 additions and 4 deletions
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, openal, fluidsynth_1
|
{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, openal, fluidsynth
|
||||||
, soundfont-fluid, libGL, SDL2, bzip2, zlib, libjpeg, libsndfile, mpg123
|
, soundfont-fluid, libGL, SDL2, bzip2, zlib, libjpeg, libsndfile, mpg123
|
||||||
, game-music-emu, pkg-config, copyDesktopItems, makeDesktopItem }:
|
, game-music-emu, pkg-config, copyDesktopItems, makeDesktopItem }:
|
||||||
|
|
||||||
|
@ -28,13 +28,13 @@ let
|
||||||
|
|
||||||
gzdoom = stdenv.mkDerivation rec {
|
gzdoom = stdenv.mkDerivation rec {
|
||||||
pname = "gzdoom";
|
pname = "gzdoom";
|
||||||
version = "4.5.0";
|
version = "4.7.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "coelckers";
|
owner = "coelckers";
|
||||||
repo = "gzdoom";
|
repo = "gzdoom";
|
||||||
rev = "g${version}";
|
rev = "g${version}";
|
||||||
sha256 = "0kmqnyhdi5psi7zwrx9j3pz0cplypsvhg4cr8w2jbawh6jb71sk9";
|
sha256 = "0xxxy7k2zr5g0vr1lnwv4n5amiwq1wln7r6hr37gmrjr72zkcjqn";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@ let
|
||||||
SDL2
|
SDL2
|
||||||
libGL
|
libGL
|
||||||
openal
|
openal
|
||||||
fluidsynth_1
|
fluidsynth
|
||||||
bzip2
|
bzip2
|
||||||
zlib
|
zlib
|
||||||
libjpeg
|
libjpeg
|
||||||
|
|
Loading…
Reference in a new issue