diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-20 06:01:21 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-20 06:01:21 +0000 |
commit | 8d8feb905eb2c52c55e0dda9c1c27e50b2169251 (patch) | |
tree | 79a9e1f920cd91da1b4ad90f91e1991ddae98635 /pkgs/applications/emulators | |
parent | 429d006c1ab358399bb5e90db3a52c85a90e67a3 (diff) | |
parent | 737d7e6765f0eb1c29e06b0072aa8bcd8ef429ae (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/emulators')
-rw-r--r-- | pkgs/applications/emulators/ppsspp/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/emulators/wine/base.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/emulators/wine/default.nix | 15 |
3 files changed, 14 insertions, 11 deletions
diff --git a/pkgs/applications/emulators/ppsspp/default.nix b/pkgs/applications/emulators/ppsspp/default.nix index 3fb0de1bf9ff8..94a04de14c91d 100644 --- a/pkgs/applications/emulators/ppsspp/default.nix +++ b/pkgs/applications/emulators/ppsspp/default.nix @@ -34,14 +34,14 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString enableQt "-qt" + lib.optionalString (!enableQt) "-sdl" + lib.optionalString forceWayland "-wayland"; - version = "1.16"; + version = "1.16.1"; src = fetchFromGitHub { owner = "hrydgard"; repo = "ppsspp"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - sha256 = "sha256-41FAInCMmgO4vxzpFKVZtITs8piQLJgBJBbGVKEd97o="; + sha256 = "sha256-bKRb7a5lEfE1uUeVl7i1He3qLJ4wI5HmKmWAk2oKdYI="; }; postPatch = '' diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index 8b1b4966ddab6..2e84a8f2091c2 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -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 diff --git a/pkgs/applications/emulators/wine/default.nix b/pkgs/applications/emulators/wine/default.nix index d3b285f36d78d..06c2b7486cd23 100644 --- a/pkgs/applications/emulators/wine/default.nix +++ b/pkgs/applications/emulators/wine/default.nix @@ -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; }); |