pyrox.dev / nixpkgs
lol
fork atom

wine-packages: support libusb and libkrb5

Randy Eckenrode 855311e1 f726c9e0

+8 -2
unified split
+2
pkgs/applications/emulators/wine/base.nix
··· 56 ++ lib.optional v4lSupport pkgs.libv4l 57 ++ lib.optional saneSupport pkgs.sane-backends 58 ++ lib.optional gphoto2Support pkgs.libgphoto2 59 ++ lib.optional ldapSupport pkgs.openldap 60 ++ lib.optional fontconfigSupport pkgs.fontconfig 61 ++ lib.optional alsaSupport pkgs.alsa-lib ··· 64 ++ lib.optional udevSupport pkgs.udev 65 ++ lib.optional vulkanSupport pkgs.vulkan-loader 66 ++ lib.optional sdlSupport pkgs.SDL2 67 ++ vkd3dArches 68 ++ lib.optionals gstreamerSupport (with pkgs.gst_all_1; 69 [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav
··· 56 ++ lib.optional v4lSupport pkgs.libv4l 57 ++ lib.optional saneSupport pkgs.sane-backends 58 ++ lib.optional gphoto2Support pkgs.libgphoto2 59 + ++ lib.optional krb5Support pkgs.libkrb5 60 ++ lib.optional ldapSupport pkgs.openldap 61 ++ lib.optional fontconfigSupport pkgs.fontconfig 62 ++ lib.optional alsaSupport pkgs.alsa-lib ··· 65 ++ lib.optional udevSupport pkgs.udev 66 ++ lib.optional vulkanSupport pkgs.vulkan-loader 67 ++ lib.optional sdlSupport pkgs.SDL2 68 + ++ lib.optional usbSupport pkgs.libusb1 69 ++ vkd3dArches 70 ++ lib.optionals gstreamerSupport (with pkgs.gst_all_1; 71 [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav
+4 -2
pkgs/applications/emulators/wine/default.nix
··· 29 v4lSupport ? false, 30 saneSupport ? false, 31 gphoto2Support ? false, 32 ldapSupport ? false, 33 pulseaudioSupport ? false, 34 udevSupport ? false, ··· 36 vulkanSupport ? false, 37 sdlSupport ? false, 38 vkd3dSupport ? false, 39 mingwSupport ? wineRelease != "stable", 40 waylandSupport ? wineRelease == "wayland", 41 embedInstallers ? false # The Mono and Gecko MSI installers ··· 48 inherit 49 cupsSupport gettextSupport dbusSupport openalSupport cairoSupport 50 odbcSupport netapiSupport cursesSupport vaSupport pcapSupport 51 - v4lSupport saneSupport gphoto2Support ldapSupport fontconfigSupport 52 alsaSupport pulseaudioSupport xineramaSupport gtkSupport openclSupport 53 tlsSupport openglSupport gstreamerSupport udevSupport vulkanSupport 54 - sdlSupport vkd3dSupport mingwSupport waylandSupport embedInstallers; 55 }; 56 }); 57
··· 29 v4lSupport ? false, 30 saneSupport ? false, 31 gphoto2Support ? false, 32 + krb5Support ? false, 33 ldapSupport ? false, 34 pulseaudioSupport ? false, 35 udevSupport ? false, ··· 37 vulkanSupport ? false, 38 sdlSupport ? false, 39 vkd3dSupport ? false, 40 + usbSupport ? false, 41 mingwSupport ? wineRelease != "stable", 42 waylandSupport ? wineRelease == "wayland", 43 embedInstallers ? false # The Mono and Gecko MSI installers ··· 50 inherit 51 cupsSupport gettextSupport dbusSupport openalSupport cairoSupport 52 odbcSupport netapiSupport cursesSupport vaSupport pcapSupport 53 + v4lSupport saneSupport gphoto2Support krb5Support ldapSupport fontconfigSupport 54 alsaSupport pulseaudioSupport xineramaSupport gtkSupport openclSupport 55 tlsSupport openglSupport gstreamerSupport udevSupport vulkanSupport 56 + sdlSupport usbSupport vkd3dSupport mingwSupport waylandSupport embedInstallers; 57 }; 58 }); 59
+2
pkgs/top-level/wine-packages.nix
··· 24 xineramaSupport = stdenv.isLinux; 25 sdlSupport = true; 26 mingwSupport = true; 27 }; 28 29 full = base.override { ··· 37 pcapSupport = true; 38 v4lSupport = stdenv.isLinux; 39 gphoto2Support = true; 40 ldapSupport = true; 41 vkd3dSupport = stdenv.isLinux; 42 embedInstallers = true;
··· 24 xineramaSupport = stdenv.isLinux; 25 sdlSupport = true; 26 mingwSupport = true; 27 + usbSupport = true; 28 }; 29 30 full = base.override { ··· 38 pcapSupport = true; 39 v4lSupport = stdenv.isLinux; 40 gphoto2Support = true; 41 + krb5Support = true; 42 ldapSupport = true; 43 vkd3dSupport = stdenv.isLinux; 44 embedInstallers = true;