Unverified Commit 6ae4dfe5 authored by 7c6f434c's avatar 7c6f434c Committed by GitHub
Browse files

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

wine: Fix missing X11 libraries for Wayland build
parents fe16955b 0ddfdc7c

pkgs/applications/emulators/wine/base.nix

+3 −3
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { 
  ++ lib.optional fontconfigSupport      pkgs.fontconfig

  ++ lib.optional alsaSupport            pkgs.alsa-lib

  ++ 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 vulkanSupport          (if stdenv.isDarwin then moltenvk else pkgs.vulkan-loader)

  ++ lib.optional sdlSupport             pkgs.SDL2
@@ -93,8 +93,8 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { 
     CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration PCSC Security

     ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenCL Cocoa Carbon

  ])

  ++ lib.optionals (stdenv.isLinux && !waylandSupport) (with pkgs.xorg; [

     libX11 libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext

  ++ lib.optionals (x11Support) (with pkgs.xorg; [

    libX11 libXcomposite libXcursor libXext libXfixes libXi libXrandr libXrender libXxf86vm

  ])

  ++ lib.optionals waylandSupport (with pkgs; [

     wayland libxkbcommon wayland-protocols wayland.dev libxkbcommon.dev

pkgs/applications/emulators/wine/default.nix

+9 −6
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
  usbSupport ? false,

  mingwSupport ? wineRelease != "stable",

  waylandSupport ? wineRelease == "wayland",

  x11Support ? stdenv.isLinux,

  embedInstallers ? false, # The Mono and Gecko MSI installers

  moltenvk ? darwin.moltenvk # Allow users to override MoltenVK easily

}:
@@ -46,12 +47,14 @@ let wine-build = build: release: 
        wineRelease = release;

        supportFlags = {

          inherit

            cupsSupport gettextSupport dbusSupport cairoSupport

            odbcSupport netapiSupport cursesSupport vaSupport pcapSupport

            v4lSupport saneSupport gphoto2Support krb5Support fontconfigSupport

            alsaSupport pulseaudioSupport xineramaSupport gtkSupport openclSupport

            tlsSupport openglSupport gstreamerSupport udevSupport vulkanSupport

            sdlSupport usbSupport mingwSupport waylandSupport embedInstallers;

            alsaSupport cairoSupport cupsSupport cursesSupport dbusSupport

            embedInstallers fontconfigSupport gettextSupport gphoto2Support

            gstreamerSupport gtkSupport krb5Support mingwSupport netapiSupport

            odbcSupport openclSupport openglSupport pcapSupport

            pulseaudioSupport saneSupport sdlSupport tlsSupport udevSupport

            usbSupport v4lSupport vaSupport vulkanSupport waylandSupport

            x11Support xineramaSupport

          ;

        };

        inherit moltenvk;

      });