From 55b08c0d56766b0bc5b560e531fd1b43fb7396eb Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 25 Jan 2023 18:36:43 +0100 Subject: [PATCH] wine: remove openalSupport From https://www.winehq.org/announce/8.0: "The OpenAL library is no longer used." --- pkgs/applications/emulators/wine/base.nix | 3 +-- pkgs/applications/emulators/wine/default.nix | 3 +-- pkgs/top-level/wine-packages.nix | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index ae38f5d3326f..a3c3eee4566d 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -71,7 +71,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optional cupsSupport pkgs.cups ++ lib.optional gettextSupport pkgs.gettext ++ lib.optional dbusSupport pkgs.dbus - ++ lib.optional openalSupport pkgs.openal ++ lib.optional cairoSupport pkgs.cairo ++ lib.optional odbcSupport pkgs.unixODBC ++ lib.optional netapiSupport pkgs.samba4 @@ -101,7 +100,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optionals (openglSupport && !stdenv.isDarwin) [ pkgs.libGLU pkgs.libGL pkgs.mesa.osmesa pkgs.libdrm ] ++ lib.optionals stdenv.isDarwin (with pkgs.buildPackages.darwin.apple_sdk.frameworks; [ CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration Security - ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenAL OpenCL Cocoa Carbon + ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenCL Cocoa Carbon ]) ++ lib.optionals (stdenv.isLinux && !waylandSupport) (with pkgs.xorg; [ libX11 libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext diff --git a/pkgs/applications/emulators/wine/default.nix b/pkgs/applications/emulators/wine/default.nix index 37953f73c5dc..70e910f2a19d 100644 --- a/pkgs/applications/emulators/wine/default.nix +++ b/pkgs/applications/emulators/wine/default.nix @@ -18,7 +18,6 @@ gstreamerSupport ? false, cupsSupport ? false, dbusSupport ? false, - openalSupport ? false, openclSupport ? false, cairoSupport ? false, odbcSupport ? false, @@ -49,7 +48,7 @@ let wine-build = build: release: wineRelease = release; supportFlags = { inherit - cupsSupport gettextSupport dbusSupport openalSupport cairoSupport + cupsSupport gettextSupport dbusSupport cairoSupport odbcSupport netapiSupport cursesSupport vaSupport pcapSupport v4lSupport saneSupport gphoto2Support krb5Support ldapSupport fontconfigSupport alsaSupport pulseaudioSupport xineramaSupport gtkSupport openclSupport diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix index c133e1472ebc..8ad136507620 100644 --- a/pkgs/top-level/wine-packages.nix +++ b/pkgs/top-level/wine-packages.nix @@ -30,7 +30,6 @@ rec { full = base.override { gtkSupport = stdenv.isLinux; gstreamerSupport = true; - openalSupport = true; openclSupport = true; odbcSupport = true; netapiSupport = stdenv.isLinux;