mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-22 12:04:40 +00:00
allegro5: fix build for mesa 18.2.5
mesa 18.2.5, introduced in 6b490ee296
changed some private headers, that allegro is relying on. This fix backports
the relevant commit from allegro upstream
cc @7c6f434c
This commit is contained in:
parent
539679ff35
commit
d06770b9a0
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, texinfo, libXext, xextproto, libX11, xproto
|
||||
{ stdenv, fetchFromGitHub, fetchpatch, texinfo, libXext, xextproto, libX11, xproto
|
||||
, libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis
|
||||
, libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto
|
||||
, xf86vidmodeproto, libXxf86vm, openal, libGLU_combined, kbproto, libjpeg, flac
|
||||
@ -28,7 +28,15 @@ stdenv.mkDerivation rec {
|
||||
libpulseaudio libpthreadstubs
|
||||
];
|
||||
|
||||
patchPhase = ''
|
||||
patches = [
|
||||
# fix compilation with mesa 18.2.5
|
||||
(fetchpatch {
|
||||
url = "https://github.com/liballeg/allegro5/commit/a40d30e21802ecf5c9382cf34af9b01bd3781e47.patch";
|
||||
sha256 = "1f1xlj5y2vr6wzmcz04s8kxn8cfdwrg9kjlnvpz9dix1z3qjnd4m";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -e 's@/XInput2.h@/XI2.h@g' -i CMakeLists.txt "src/"*.c
|
||||
'';
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user