lol
fork

Configure Feed

Select the types of activity you want to include in your feed.

wine: remove vkd3dSupport

From https://www.winehq.org/announce/8.0:

"The vkd3d and LDAP libraries are bundled in the source tree and built as
PE. The corresponding Unix libraries are no longer needed."

+1 -38
-2
pkgs/applications/emulators/wine/base.nix
··· 4 4 autoconf, hexdump, perl, nixosTests, 5 5 supportFlags, 6 6 patches, 7 - vkd3dArches, 8 7 moltenvk, 9 8 buildScript ? null, configureFlags ? [], mainProgram ? "wine" 10 9 }: ··· 89 88 ++ lib.optional vulkanSupport (if stdenv.isDarwin then moltenvk else pkgs.vulkan-loader) 90 89 ++ lib.optional sdlSupport pkgs.SDL2 91 90 ++ lib.optional usbSupport pkgs.libusb1 92 - ++ vkd3dArches 93 91 ++ lib.optionals gstreamerSupport (with pkgs.gst_all_1; 94 92 [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav 95 93 (gst-plugins-bad.override { enableZbar = false; }) ])
+1 -2
pkgs/applications/emulators/wine/default.nix
··· 34 34 xineramaSupport ? false, 35 35 vulkanSupport ? false, 36 36 sdlSupport ? false, 37 - vkd3dSupport ? false, 38 37 usbSupport ? false, 39 38 mingwSupport ? wineRelease != "stable", 40 39 waylandSupport ? wineRelease == "wayland", ··· 52 51 v4lSupport saneSupport gphoto2Support krb5Support fontconfigSupport 53 52 alsaSupport pulseaudioSupport xineramaSupport gtkSupport openclSupport 54 53 tlsSupport openglSupport gstreamerSupport udevSupport vulkanSupport 55 - sdlSupport usbSupport vkd3dSupport mingwSupport waylandSupport embedInstallers; 54 + sdlSupport usbSupport mingwSupport waylandSupport embedInstallers; 56 55 }; 57 56 inherit moltenvk; 58 57 });
-5
pkgs/applications/emulators/wine/packages.nix
··· 5 5 6 6 let 7 7 src = lib.getAttr wineRelease (callPackage ./sources.nix {}); 8 - vkd3d = pkgs.callPackage ./vkd3d.nix { inherit moltenvk; }; 9 - vkd3d_i686 = pkgsi686Linux.callPackage ./vkd3d.nix { inherit moltenvk; }; 10 8 in with src; { 11 9 wine32 = pkgsi686Linux.callPackage ./base.nix { 12 10 pname = "wine"; 13 11 inherit src version supportFlags patches moltenvk; 14 12 pkgArches = [ pkgsi686Linux ]; 15 - vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d_i686 ]; 16 13 geckos = [ gecko32 ]; 17 14 mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc ]; 18 15 monos = [ mono ]; ··· 22 19 pname = "wine64"; 23 20 inherit src version supportFlags patches moltenvk; 24 21 pkgArches = [ pkgs ]; 25 - vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d ]; 26 22 mingwGccs = with pkgsCross; [ mingwW64.buildPackages.gcc ]; 27 23 geckos = [ gecko64 ]; 28 24 monos = [ mono ]; ··· 35 31 inherit src version supportFlags patches moltenvk; 36 32 stdenv = stdenv_32bit; 37 33 pkgArches = [ pkgs pkgsi686Linux ]; 38 - vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d vkd3d_i686 ]; 39 34 geckos = [ gecko32 gecko64 ]; 40 35 mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc mingwW64.buildPackages.gcc ]; 41 36 monos = [ mono ];
-28
pkgs/applications/emulators/wine/vkd3d.nix
··· 1 - { lib, stdenv, fetchurl, moltenvk, vulkan-headers, spirv-headers, vulkan-loader, flex, bison }: 2 - 3 - #TODO: unstable 4 - 5 - stdenv.mkDerivation rec { 6 - pname = "vkd3d"; 7 - version = "1.5"; 8 - 9 - src = fetchurl { 10 - url = "https://dl.winehq.org/vkd3d/source/vkd3d-${version}.tar.xz"; 11 - sha256 = "sha256-47PDVfRvfL/BnnEKR4vLK+4mel82Dn5kBiOM6lLOLPw="; 12 - }; 13 - 14 - nativeBuildInputs = [ flex bison ]; 15 - 16 - buildInputs = [ vulkan-headers spirv-headers ] 17 - ++ [ (if stdenv.isDarwin then moltenvk else vulkan-loader) ]; 18 - 19 - enableParallelBuilding = true; 20 - 21 - meta = with lib; { 22 - description = "A 3d library build on top on Vulkan with a similar api to DirectX 12"; 23 - homepage = "https://source.winehq.org/git/vkd3d.git"; 24 - license = licenses.lgpl21; 25 - platforms = platforms.unix; 26 - maintainers = [ maintainers.marius851000 ]; 27 - }; 28 - }
-1
pkgs/top-level/wine-packages.nix
··· 38 38 v4lSupport = stdenv.isLinux; 39 39 gphoto2Support = true; 40 40 krb5Support = true; 41 - vkd3dSupport = stdenv.isLinux; 42 41 embedInstallers = true; 43 42 }; 44 43