colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #271207 from OPNA2608/fix/dosbox-x_modem

Browse Source 
{dosbox,dosbox-x}: Fix modem & IPX support, fix crash with Windows 3.0
This commit is contained in:
Weijia Wang 2023-12-03 23:18:22 +01:00 committed by GitHub
commit 091198f215
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/applications/emulators/dosbox-x/default.nix
View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, alsa-lib
, AudioUnit
, autoreconfHook
@ -36,6 +37,21 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-YNYtYqcpTOx4xS/LXI53h3S+na8JVpn4w8Dhf4fWNBQ=";
};
patches = [
# 2 patches which fix stack smashing when launching Windows 3.0
# Remove when version > 2023.10.06
(fetchpatch {
name = "0001-dosbox-x-Attempt-to-fix-graphical-palette-issues-added-by-TTF-fix.patch";
url = "https://github.com/joncampbell123/dosbox-x/commit/40bf135f70376b5c3944fe2e972bdb7143439bcc.patch";
hash = "sha256-9whtqBkivYVYaPObyTODtwcfjaoK+rLqhCNZ7zVoiGI=";
})
(fetchpatch {
name = "0002-dosbox-x-Fix-Sid-Meiers-Civ-crash.patch";
url = "https://github.com/joncampbell123/dosbox-x/compare/cdcfb554999572e758b81edf85a007d398626b78..ac91760d9353c301e1da382f93e596238cf6d336.patch";
hash = "sha256-G7HbUhYEi6JJklN1z3JiOTnWLuWb27bMDyB/iGwywuY=";
})
];
strictDeps = true;
nativeBuildInputs = [
@ -66,6 +82,9 @@ stdenv.mkDerivation (finalAttrs: {
Cocoa
];
# Tests for SDL_net.h for modem & IPX support, not automatically picked up due to being in SDL2 subdirectory
env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL2_net}/include/SDL2";
configureFlags = [ "--enable-sdl2" ];
enableParallelBuilding = true;

3
pkgs/applications/emulators/dosbox/default.nix
View File

@ -50,6 +50,9 @@ stdenv.mkDerivation rec {
libGLU
]);
# Tests for SDL_net.h for modem & IPX support, not automatically picked up due to being in SDL subdirectory
env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL_net}/include/SDL";
hardeningDisable = [ "format" ];
configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";