Unverified Commit 62ffb0f2 authored by Artturin's avatar Artturin Committed by GitHub
Browse files

Merge pull request #324217 from cjab/86Box 

86Box: Add optional wayland support
parents a167a166 a04d89c8

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

+8 −2
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
  lib,

  fetchFromGitHub,

  cmake,

  extra-cmake-modules,

  pkg-config,

  makeWrapper,

  freetype,
@@ -19,10 +20,13 @@ 
  discord-gamesdk,

  libpcap,

  libslirp,

  wayland,

  wayland-scanner,



  enableDynarec ? with stdenv.hostPlatform; isx86 || isAarch,

  enableNewDynarec ? enableDynarec && stdenv.hostPlatform.isAarch,

  enableVncRenderer ? false,

  enableWayland ? stdenv.isLinux,

  unfreeEnableDiscord ? false,

  unfreeEnableRoms ? false,

}:
@@ -43,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { 
    pkg-config

    makeWrapper

    qt5.wrapQtAppsHook

  ];

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



  buildInputs = [

    freetype
@@ -58,7 +62,9 @@ stdenv.mkDerivation (finalAttrs: { 
    libslirp

    qt5.qtbase

    qt5.qttools

  ] ++ lib.optional stdenv.isLinux alsa-lib ++ lib.optional enableVncRenderer libvncserver;

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

    ++ lib.optional enableWayland wayland

    ++ lib.optional enableVncRenderer libvncserver;



  cmakeFlags =

    lib.optional stdenv.isDarwin "-DCMAKE_MACOSX_BUNDLE=OFF"