lol

dosbox-staging: pull upstream fixes for SDL2_net and SDL2_image headers

Without the change `dosbox-staging` fails to build as:

FAILED: src/dos/libdos.a.p/program_serial.cpp.o
g++ -Isrc/dos/libdos.a.p -Isrc/dos -I../src/dos -I../include -I. -I.. -Isrc/libs/ghc -I../src/libs/ghc -Isrc/libs/loguru -I../src/libs/loguru -I/nix/store/58cdrn1birpig59wqygva9cmsnxh7wwa-SDL2-2.26.4-dev/include -I/nix/store/58cdrn1birpig59wqygva9cmsnxh7wwa-SDL2-2.26.4-dev/include/SDL2 -I/nix/store/y8ab9wi9sldj6y7md833xkbppgimrs>
In file included from ../src/dos/../hardware/serialport/softmodem.h:30,
from ../src/dos/program_serial.cpp:27:
../src/dos/../hardware/serialport/misc_util.h:59:10: fatal error: SDL_net.h: No such file or directory
59 | #include <SDL_net.h>
| ^~~~~~~~~~~

authored by

Sergei Trofimovich and committed by
Anderson Torres
ec9f9bc6 1eea8d50

+20 -5
+20 -5
pkgs/applications/emulators/dosbox-staging/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchFromGitHub 4 + , fetchpatch 4 5 , SDL2 5 6 , SDL2_image 6 7 , SDL2_net ··· 39 40 hash = "sha256-I90poBeLSq1c8PXyjrx7/UcbfqFNnnNiXfJdWhLPGMc="; 40 41 }; 41 42 43 + patches = [ 44 + # Pull missind SDL2_net dependency: 45 + # https://github.com/dosbox-staging/dosbox-staging/pull/2358 46 + (fetchpatch { 47 + name = "sdl2-net.patch"; 48 + url = "https://github.com/dosbox-staging/dosbox-staging/commit/1b02f187a39263f4b0285323dcfe184bccd749c2.patch"; 49 + hash = "sha256-Ev97xApInu6r5wvI9Q7FhkSXqtMW/rwJj48fExvqnT0="; 50 + }) 51 + 52 + # Pull missing SDL2_image dependency: 53 + # https://github.com/dosbox-staging/dosbox-staging/pull/2239 54 + (fetchpatch { 55 + name = "sdl2-image.patch"; 56 + url = "https://github.com/dosbox-staging/dosbox-staging/commit/ca8b7a906d29a3f8ce956c4af7dc829a6ac3e229.patch"; 57 + hash = "sha256-WtTVSWWSlfXrdPVsnlDe4P5K/Fnj4QsOzx3Wo/Kusmg="; 58 + includes = [ "src/gui/meson.build" ]; 59 + }) 60 + ]; 61 + 42 62 nativeBuildInputs = [ 43 63 copyDesktopItems 44 64 gtest ··· 67 87 SDL2_image 68 88 SDL2_net 69 89 speexdsp 70 - ]; 71 - 72 - env.NIX_CFLAGS_COMPILE = toString [ 73 - "-I${SDL2_image}/include/SDL2" 74 - "-I${SDL2_net}/include/SDL2" 75 90 ]; 76 91 77 92 desktopItems = [