From b26cca0e697d83014cff0361304d81e651bbc7ed Mon Sep 17 00:00:00 2001 From: root Date: Tue, 3 Oct 2023 19:23:46 +0200 Subject: [PATCH] dosbox-x: Enable on Darwin --- .../emulators/dosbox-x/default.nix | 19 +++++++++++++------ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/emulators/dosbox-x/default.nix b/pkgs/applications/emulators/dosbox-x/default.nix index 63643bd74c5d..5ddbed964c6c 100644 --- a/pkgs/applications/emulators/dosbox-x/default.nix +++ b/pkgs/applications/emulators/dosbox-x/default.nix @@ -19,6 +19,9 @@ , SDL2_net , yad , zlib +, AudioUnit +, Carbon +, Cocoa }: stdenv.mkDerivation (finalAttrs: { @@ -40,7 +43,6 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - alsa-lib ffmpeg fluidsynth freetype @@ -48,13 +50,18 @@ stdenv.mkDerivation (finalAttrs: { libpcap libpng libslirp - libxkbfile - libXrandr ncurses SDL2 SDL2_net - yad zlib + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + libxkbfile + libXrandr + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + AudioUnit + Carbon + Cocoa ]; configureFlags = [ "--enable-sdl2" ]; @@ -63,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { hardeningDisable = [ "format" ]; # https://github.com/joncampbell123/dosbox-x/issues/4436 - postInstall = '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/dosbox-x \ --prefix PATH : ${lib.makeBinPath [ yad ]} ''; @@ -80,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ hughobrien OPNA2608 ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; mainProgram = "dosbox-x"; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 976a81cde558..a2e840bf69df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2614,7 +2614,9 @@ with pkgs; dosbox-staging = callPackage ../applications/emulators/dosbox-staging { }; - dosbox-x = callPackage ../applications/emulators/dosbox-x { }; + dosbox-x = darwin.apple_sdk_11_0.callPackage ../applications/emulators/dosbox-x { + inherit (darwin.apple_sdk_11_0.frameworks) AudioUnit Carbon Cocoa; + }; duckstation = qt6Packages.callPackage ../applications/emulators/duckstation { }; -- 2.42.0