Merge pull request #187713 from ThibaultLemaire/fix-gzdoom-kdialog-not-found

This commit is contained in:
Lassulus 2022-09-09 20:50:22 +02:00 committed by GitHub
commit 19e2aba59e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, openal, fluidsynth
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, openal, fluidsynth
, soundfont-fluid, libGL, SDL2, bzip2, zlib, libjpeg, libsndfile, libvpx, mpg123
, game-music-emu, pkg-config, copyDesktopItems, makeDesktopItem }:
@ -52,6 +52,13 @@ let
zmusic
];
patches = [
(fetchpatch { # TODO: Delete me when upgrading to 4.9
url = "https://github.com/ZDoom/gzdoom/commit/aae85a1b9169953d8dcc5f138a477d5c7d75addb.patch";
sha256 = "upuLDgVMaGaFSVaDV9Hj13DR5LUma51xv+Mfsz9m9a0=";
})
];
NIX_CFLAGS_LINK = "-lopenal -lfluidsynth";
desktopItems = [