dosbox: Fix on Darwin

This previously pulled in Mesa on Darwin, which has recently been marked broken there due to an upstream bug.
The configure script uses OpenGL framework on Darwin, libGL everywhere else. So don't pull in Mesa on Darwin,
pass it OpenGL instead.
This commit is contained in:
OPNA2608 2023-07-18 21:43:55 +02:00
parent 13222d8d86
commit 7594c74cea
2 changed files with 7 additions and 2 deletions

View File

@ -9,6 +9,7 @@
, graphicsmagick
, libGL
, libGLU
, OpenGL
, libpng
, makeDesktopItem
}:
@ -32,10 +33,13 @@ stdenv.mkDerivation rec {
SDL
SDL_net
SDL_sound
libpng
] ++ (if stdenv.hostPlatform.isDarwin then [
OpenGL
] else [
libGL
libGLU
libpng
];
]);
hardeningDisable = [ "format" ];

View File

@ -2408,6 +2408,7 @@ with pkgs;
dlx = callPackage ../applications/emulators/dlx { };
dosbox = callPackage ../applications/emulators/dosbox {
inherit (darwin.apple_sdk.frameworks ) OpenGL;
SDL = if stdenv.isDarwin then SDL else SDL_compat;
};