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."
This commit is contained in:
Stefan Frijters 2023-01-25 18:41:27 +01:00
parent 3dbfc39ac5
commit 1e14a900a5
No known key found for this signature in database
GPG key ID: 7619A6BC6E7DFA6F
5 changed files with 1 additions and 38 deletions

View file

@ -4,7 +4,6 @@
autoconf, hexdump, perl, nixosTests,
supportFlags,
patches,
vkd3dArches,
moltenvk,
buildScript ? null, configureFlags ? [], mainProgram ? "wine"
}:
@ -89,7 +88,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
++ lib.optional vulkanSupport (if stdenv.isDarwin then moltenvk else 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
(gst-plugins-bad.override { enableZbar = false; }) ])

View file

@ -34,7 +34,6 @@
xineramaSupport ? false,
vulkanSupport ? false,
sdlSupport ? false,
vkd3dSupport ? false,
usbSupport ? false,
mingwSupport ? wineRelease != "stable",
waylandSupport ? wineRelease == "wayland",
@ -52,7 +51,7 @@ let wine-build = build: release:
v4lSupport saneSupport gphoto2Support krb5Support fontconfigSupport
alsaSupport pulseaudioSupport xineramaSupport gtkSupport openclSupport
tlsSupport openglSupport gstreamerSupport udevSupport vulkanSupport
sdlSupport usbSupport vkd3dSupport mingwSupport waylandSupport embedInstallers;
sdlSupport usbSupport mingwSupport waylandSupport embedInstallers;
};
inherit moltenvk;
});

View file

@ -5,14 +5,11 @@
let
src = lib.getAttr wineRelease (callPackage ./sources.nix {});
vkd3d = pkgs.callPackage ./vkd3d.nix { inherit moltenvk; };
vkd3d_i686 = pkgsi686Linux.callPackage ./vkd3d.nix { inherit moltenvk; };
in with src; {
wine32 = pkgsi686Linux.callPackage ./base.nix {
pname = "wine";
inherit src version supportFlags patches moltenvk;
pkgArches = [ pkgsi686Linux ];
vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d_i686 ];
geckos = [ gecko32 ];
mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc ];
monos = [ mono ];
@ -22,7 +19,6 @@ in with src; {
pname = "wine64";
inherit src version supportFlags patches moltenvk;
pkgArches = [ pkgs ];
vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d ];
mingwGccs = with pkgsCross; [ mingwW64.buildPackages.gcc ];
geckos = [ gecko64 ];
monos = [ mono ];
@ -35,7 +31,6 @@ in with src; {
inherit src version supportFlags patches moltenvk;
stdenv = stdenv_32bit;
pkgArches = [ pkgs pkgsi686Linux ];
vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d vkd3d_i686 ];
geckos = [ gecko32 gecko64 ];
mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc mingwW64.buildPackages.gcc ];
monos = [ mono ];

View file

@ -1,28 +0,0 @@
{ lib, stdenv, fetchurl, moltenvk, vulkan-headers, spirv-headers, vulkan-loader, flex, bison }:
#TODO: unstable
stdenv.mkDerivation rec {
pname = "vkd3d";
version = "1.5";
src = fetchurl {
url = "https://dl.winehq.org/vkd3d/source/vkd3d-${version}.tar.xz";
sha256 = "sha256-47PDVfRvfL/BnnEKR4vLK+4mel82Dn5kBiOM6lLOLPw=";
};
nativeBuildInputs = [ flex bison ];
buildInputs = [ vulkan-headers spirv-headers ]
++ [ (if stdenv.isDarwin then moltenvk else vulkan-loader) ];
enableParallelBuilding = true;
meta = with lib; {
description = "A 3d library build on top on Vulkan with a similar api to DirectX 12";
homepage = "https://source.winehq.org/git/vkd3d.git";
license = licenses.lgpl21;
platforms = platforms.unix;
maintainers = [ maintainers.marius851000 ];
};
}

View file

@ -38,7 +38,6 @@ rec {
v4lSupport = stdenv.isLinux;
gphoto2Support = true;
krb5Support = true;
vkd3dSupport = stdenv.isLinux;
embedInstallers = true;
};