pyrox.dev / nixpkgs
lol
fork atom

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

wine: Fix missing X11 libraries for Wayland build

authored by 7c6f434c and committed by GitHub 6ae4dfe5 fe16955b

+12 -9
unified split
+3 -3
pkgs/applications/emulators/wine/base.nix
··· 78 78 ++ lib.optional fontconfigSupport pkgs.fontconfig 79 79 ++ lib.optional alsaSupport pkgs.alsa-lib 80 80 ++ lib.optional pulseaudioSupport pkgs.libpulseaudio 81 - ++ lib.optional (xineramaSupport && !waylandSupport) pkgs.xorg.libXinerama 81 + ++ lib.optional (xineramaSupport && x11Support) pkgs.xorg.libXinerama 82 82 ++ lib.optional udevSupport pkgs.udev 83 83 ++ lib.optional vulkanSupport (if stdenv.isDarwin then moltenvk else pkgs.vulkan-loader) 84 84 ++ lib.optional sdlSupport pkgs.SDL2 ··· 93 93 CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration PCSC Security 94 94 ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenCL Cocoa Carbon 95 95 ]) 96 - ++ lib.optionals (stdenv.isLinux && !waylandSupport) (with pkgs.xorg; [ 97 - libX11 libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext 96 + ++ lib.optionals (x11Support) (with pkgs.xorg; [ 97 + libX11 libXcomposite libXcursor libXext libXfixes libXi libXrandr libXrender libXxf86vm 98 98 ]) 99 99 ++ lib.optionals waylandSupport (with pkgs; [ 100 100 wayland libxkbcommon wayland-protocols wayland.dev libxkbcommon.dev
+9 -6
pkgs/applications/emulators/wine/default.nix
··· 37 37 usbSupport ? false, 38 38 mingwSupport ? wineRelease != "stable", 39 39 waylandSupport ? wineRelease == "wayland", 40 + x11Support ? stdenv.isLinux, 40 41 embedInstallers ? false, # The Mono and Gecko MSI installers 41 42 moltenvk ? darwin.moltenvk # Allow users to override MoltenVK easily 42 43 }: ··· 46 47 wineRelease = release; 47 48 supportFlags = { 48 49 inherit 49 - cupsSupport gettextSupport dbusSupport cairoSupport 50 - odbcSupport netapiSupport cursesSupport vaSupport pcapSupport 51 - v4lSupport saneSupport gphoto2Support krb5Support fontconfigSupport 52 - alsaSupport pulseaudioSupport xineramaSupport gtkSupport openclSupport 53 - tlsSupport openglSupport gstreamerSupport udevSupport vulkanSupport 54 - sdlSupport usbSupport mingwSupport waylandSupport embedInstallers; 50 + alsaSupport cairoSupport cupsSupport cursesSupport dbusSupport 51 + embedInstallers fontconfigSupport gettextSupport gphoto2Support 52 + gstreamerSupport gtkSupport krb5Support mingwSupport netapiSupport 53 + odbcSupport openclSupport openglSupport pcapSupport 54 + pulseaudioSupport saneSupport sdlSupport tlsSupport udevSupport 55 + usbSupport v4lSupport vaSupport vulkanSupport waylandSupport 56 + x11Support xineramaSupport 57 + ; 55 58 }; 56 59 inherit moltenvk; 57 60 });