From 7594c74ceab016bc99ea24d4ed1a20308e586981 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Tue, 18 Jul 2023 21:43:55 +0200 Subject: [PATCH] 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. --- pkgs/applications/emulators/dosbox/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/dosbox/default.nix b/pkgs/applications/emulators/dosbox/default.nix index 852586cc6986..a8d4df2e5feb 100644 --- a/pkgs/applications/emulators/dosbox/default.nix +++ b/pkgs/applications/emulators/dosbox/default.nix @@ -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" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 39f4d3a3aa04..bb3c4e7367dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; };