JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #255835 from YellowOnion/wine-wayland-fix

Browse Source 
wine: Fix missing X11 libraries for Wayland build
This commit is contained in:
7c6f434c 2023-09-20 04:58:53 +00:00 committed by GitHub
commit 6ae4dfe5f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/emulators/wine/base.nix
View File

@ -78,7 +78,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
++ lib.optional fontconfigSupport pkgs.fontconfig ++ lib.optional fontconfigSupport pkgs.fontconfig
++ lib.optional alsaSupport pkgs.alsa-lib ++ lib.optional alsaSupport pkgs.alsa-lib
++ lib.optional pulseaudioSupport pkgs.libpulseaudio ++ lib.optional pulseaudioSupport pkgs.libpulseaudio
++ lib.optional (xineramaSupport && !waylandSupport) pkgs.xorg.libXinerama ++ lib.optional (xineramaSupport && x11Support) pkgs.xorg.libXinerama
++ lib.optional udevSupport pkgs.udev ++ lib.optional udevSupport pkgs.udev
++ lib.optional vulkanSupport (if stdenv.isDarwin then moltenvk else pkgs.vulkan-loader) ++ lib.optional vulkanSupport (if stdenv.isDarwin then moltenvk else pkgs.vulkan-loader)
++ lib.optional sdlSupport pkgs.SDL2 ++ lib.optional sdlSupport pkgs.SDL2
@ -93,8 +93,8 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration PCSC Security CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration PCSC Security
ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenCL Cocoa Carbon ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenCL Cocoa Carbon
]) ])
++ lib.optionals (stdenv.isLinux && !waylandSupport) (with pkgs.xorg; [ ++ lib.optionals (x11Support) (with pkgs.xorg; [
libX11 libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext libX11 libXcomposite libXcursor libXext libXfixes libXi libXrandr libXrender libXxf86vm
]) ])
++ lib.optionals waylandSupport (with pkgs; [ ++ lib.optionals waylandSupport (with pkgs; [
wayland libxkbcommon wayland-protocols wayland.dev libxkbcommon.dev wayland libxkbcommon wayland-protocols wayland.dev libxkbcommon.dev

15
pkgs/applications/emulators/wine/default.nix
View File

@ -37,6 +37,7 @@
usbSupport ? false, usbSupport ? false,
mingwSupport ? wineRelease != "stable", mingwSupport ? wineRelease != "stable",
waylandSupport ? wineRelease == "wayland", waylandSupport ? wineRelease == "wayland",
x11Support ? stdenv.isLinux,
embedInstallers ? false, # The Mono and Gecko MSI installers embedInstallers ? false, # The Mono and Gecko MSI installers
moltenvk ? darwin.moltenvk # Allow users to override MoltenVK easily moltenvk ? darwin.moltenvk # Allow users to override MoltenVK easily
}: }:
@ -46,12 +47,14 @@ let wine-build = build: release:
wineRelease = release; wineRelease = release;
supportFlags = { supportFlags = {
inherit inherit
cupsSupport gettextSupport dbusSupport cairoSupport alsaSupport cairoSupport cupsSupport cursesSupport dbusSupport
odbcSupport netapiSupport cursesSupport vaSupport pcapSupport embedInstallers fontconfigSupport gettextSupport gphoto2Support
v4lSupport saneSupport gphoto2Support krb5Support fontconfigSupport gstreamerSupport gtkSupport krb5Support mingwSupport netapiSupport
alsaSupport pulseaudioSupport xineramaSupport gtkSupport openclSupport odbcSupport openclSupport openglSupport pcapSupport
tlsSupport openglSupport gstreamerSupport udevSupport vulkanSupport pulseaudioSupport saneSupport sdlSupport tlsSupport udevSupport
sdlSupport usbSupport mingwSupport waylandSupport embedInstallers; usbSupport v4lSupport vaSupport vulkanSupport waylandSupport
x11Support xineramaSupport
;
}; };
inherit moltenvk; inherit moltenvk;
}); });