diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index 480fc009504e..815048d204c7 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optional v4lSupport pkgs.libv4l ++ lib.optional saneSupport pkgs.sane-backends ++ lib.optional gphoto2Support pkgs.libgphoto2 + ++ lib.optional krb5Support pkgs.libkrb5 ++ lib.optional ldapSupport pkgs.openldap ++ lib.optional fontconfigSupport pkgs.fontconfig ++ lib.optional alsaSupport pkgs.alsa-lib @@ -64,6 +65,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optional udevSupport pkgs.udev ++ lib.optional vulkanSupport pkgs.vulkan-loader ++ lib.optional sdlSupport pkgs.SDL2 + ++ lib.optional usbSupport pkgs.libusb1 ++ vkd3dArches ++ lib.optionals gstreamerSupport (with pkgs.gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav diff --git a/pkgs/applications/emulators/wine/default.nix b/pkgs/applications/emulators/wine/default.nix index 191fd4b29800..082d57389852 100644 --- a/pkgs/applications/emulators/wine/default.nix +++ b/pkgs/applications/emulators/wine/default.nix @@ -29,6 +29,7 @@ v4lSupport ? false, saneSupport ? false, gphoto2Support ? false, + krb5Support ? false, ldapSupport ? false, pulseaudioSupport ? false, udevSupport ? false, @@ -36,6 +37,7 @@ vulkanSupport ? false, sdlSupport ? false, vkd3dSupport ? false, + usbSupport ? false, mingwSupport ? wineRelease != "stable", waylandSupport ? wineRelease == "wayland", embedInstallers ? false # The Mono and Gecko MSI installers @@ -48,10 +50,10 @@ let wine-build = build: release: inherit cupsSupport gettextSupport dbusSupport openalSupport cairoSupport odbcSupport netapiSupport cursesSupport vaSupport pcapSupport - v4lSupport saneSupport gphoto2Support ldapSupport fontconfigSupport + v4lSupport saneSupport gphoto2Support krb5Support ldapSupport fontconfigSupport alsaSupport pulseaudioSupport xineramaSupport gtkSupport openclSupport tlsSupport openglSupport gstreamerSupport udevSupport vulkanSupport - sdlSupport vkd3dSupport mingwSupport waylandSupport embedInstallers; + sdlSupport usbSupport vkd3dSupport mingwSupport waylandSupport embedInstallers; }; }); diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix index 303b5988f43e..d15ac9f0c9b0 100644 --- a/pkgs/top-level/wine-packages.nix +++ b/pkgs/top-level/wine-packages.nix @@ -24,6 +24,7 @@ rec { xineramaSupport = stdenv.isLinux; sdlSupport = true; mingwSupport = true; + usbSupport = true; }; full = base.override { @@ -37,6 +38,7 @@ rec { pcapSupport = true; v4lSupport = stdenv.isLinux; gphoto2Support = true; + krb5Support = true; ldapSupport = true; vkd3dSupport = stdenv.isLinux; embedInstallers = true;