nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 07:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #324217 from cjab/86Box

Browse Source 
86Box: Add optional wayland support
This commit is contained in:
Artturin 2024-07-15 21:52:10 +03:00 committed by GitHub
commit 62ffb0f202
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/emulators/86box/default.nix
View File

@ -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"