Loading 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 +10 −2 Original line number Diff line number Diff line { stdenv, darwin, lib, fetchFromGitHub, cmake, Loading Loading @@ -42,6 +43,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ioE0EVIXv/biXXvLqwhmtZ/RJM0nLqcE+i+CU+WXBY4="; }; patches = [ ./darwin.patch ]; postPatch = '' substituteAllInPlace src/qt/qt_platform.cpp ''; nativeBuildInputs = [ cmake pkg-config Loading @@ -64,7 +71,8 @@ stdenv.mkDerivation (finalAttrs: { qt5.qttools ] ++ 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" Loading Loading @@ -114,6 +122,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://86box.net/"; license = with licenses; [ gpl2Only ] ++ optional (unfreeEnableDiscord || unfreeEnableRoms) unfree; maintainers = [ maintainers.jchw ]; platforms = platforms.linux; platforms = platforms.linux ++ platforms.darwin; }; }) Loading
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 +10 −2 Original line number Diff line number Diff line { stdenv, darwin, lib, fetchFromGitHub, cmake, Loading Loading @@ -42,6 +43,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ioE0EVIXv/biXXvLqwhmtZ/RJM0nLqcE+i+CU+WXBY4="; }; patches = [ ./darwin.patch ]; postPatch = '' substituteAllInPlace src/qt/qt_platform.cpp ''; nativeBuildInputs = [ cmake pkg-config Loading @@ -64,7 +71,8 @@ stdenv.mkDerivation (finalAttrs: { qt5.qttools ] ++ 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" Loading Loading @@ -114,6 +122,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://86box.net/"; license = with licenses; [ gpl2Only ] ++ optional (unfreeEnableDiscord || unfreeEnableRoms) unfree; maintainers = [ maintainers.jchw ]; platforms = platforms.linux; platforms = platforms.linux ++ platforms.darwin; }; })