Unverified Commit 1c3e50da authored by Masum Reza's avatar Masum Reza Committed by GitHub
Browse files

Merge pull request #335384 from matteo-pacini/86box-aarch64-darwin 

_86Box: darwin support, add maintainer, derivation cleanup (`with lib;` and RFC format)
parents 6c31eb9b a878e02e

pkgs/applications/emulators/86box/darwin.patch

0 → 100644
+15 −0
Original line number Diff line number Diff line 
diff --git a/src/qt/qt_platform.cpp b/src/qt/qt_platform.cpp

index 824f71023..1f38e4b5f 100644

--- a/src/qt/qt_platform.cpp

+++ b/src/qt/qt_platform.cpp

@@ -673,6 +673,10 @@ plat_init_rom_paths(void)

         rom_add_path(QDir(path).filePath("86Box/roms").toUtf8().constData());

 #endif

     }

+

+    #ifdef __APPLE__

+    rom_add_path("@out@/share/86Box/roms/");

+    #endif

 }

 

 void

pkgs/applications/emulators/86box/default.nix

+45 −25
Original line number Diff line number Diff line 
{

  stdenv,

  darwin,

  lib,

  fetchFromGitHub,

  cmake,
@@ -42,14 +43,26 @@ stdenv.mkDerivation (finalAttrs: { 
    hash = "sha256-ioE0EVIXv/biXXvLqwhmtZ/RJM0nLqcE+i+CU+WXBY4=";

  };



  nativeBuildInputs = [

  patches = [ ./darwin.patch ];



  postPatch = ''

    substituteAllInPlace src/qt/qt_platform.cpp

  '';



  nativeBuildInputs =

    [

      cmake

      pkg-config

      makeWrapper

      qt5.wrapQtAppsHook

  ] ++ lib.optionals enableWayland [ extra-cmake-modules wayland-scanner ];

    ]

    ++ lib.optionals enableWayland [

      extra-cmake-modules

      wayland-scanner

    ];



  buildInputs = [

  buildInputs =

    [

      freetype

      fluidsynth

      SDL2
@@ -62,9 +75,11 @@ stdenv.mkDerivation (finalAttrs: { 
      libslirp

      qt5.qtbase

      qt5.qttools

  ] ++ lib.optional stdenv.isLinux alsa-lib

    ]

    ++ lib.optional stdenv.isLinux alsa-lib

    ++ lib.optional enableWayland wayland

    ++ lib.optional enableVncRenderer libvncserver;

    ++ lib.optional enableVncRenderer libvncserver

    ++ lib.optional stdenv.isDarwin darwin.apple_sdk_11_0.libs.xpc;



  cmakeFlags =

    lib.optional stdenv.isDarwin "-DCMAKE_MACOSX_BUNDLE=OFF"
@@ -108,12 +123,17 @@ stdenv.mkDerivation (finalAttrs: { 
      makeWrapperArgs+=(--prefix ${libPathVar} : "${libPath}")

    '';



  meta = with lib; {

  meta = {

    description = "Emulator of x86-based machines based on PCem";

    mainProgram = "86Box";

    homepage = "https://86box.net/";

    license = with licenses; [ gpl2Only ] ++ optional (unfreeEnableDiscord || unfreeEnableRoms) unfree;

    maintainers = [ maintainers.jchw ];

    platforms = platforms.linux;

    license =

      with lib.licenses;

      [ gpl2Only ] ++ lib.optional (unfreeEnableDiscord || unfreeEnableRoms) unfree;

    maintainers = with lib.maintainers; [

      jchw

      matteopacini

    ];

    platforms = lib.platforms.linux ++ lib.platforms.darwin;

  };

})