diff options
author | Stefan Frijters <sfrijters@gmail.com> | 2023-01-25 18:41:27 +0100 |
---|---|---|
committer | Stefan Frijters <sfrijters@gmail.com> | 2023-02-03 23:06:35 +0100 |
commit | 1e14a900a59e9f1d550d26182f2573765bbe5af3 (patch) | |
tree | 447ced97f65620265b0f2aee581cdbb01d8f6a59 | |
parent | 3dbfc39ac5f517f7158e5c5c4e9d7e385f36a861 (diff) |
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."
-rw-r--r-- | pkgs/applications/emulators/wine/base.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/emulators/wine/default.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/emulators/wine/packages.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/emulators/wine/vkd3d.nix | 28 | ||||
-rw-r--r-- | pkgs/top-level/wine-packages.nix | 1 |
5 files changed, 1 insertions, 38 deletions
diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index 8e8d0b631aa4..ed9e24a910f6 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -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; }) ]) diff --git a/pkgs/applications/emulators/wine/default.nix b/pkgs/applications/emulators/wine/default.nix index 5c552bd40dbe..d3b285f36d78 100644 --- a/pkgs/applications/emulators/wine/default.nix +++ b/pkgs/applications/emulators/wine/default.nix @@ -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; }); diff --git a/pkgs/applications/emulators/wine/packages.nix b/pkgs/applications/emulators/wine/packages.nix index 3b5aa19658ce..2672e75580cb 100644 --- a/pkgs/applications/emulators/wine/packages.nix +++ b/pkgs/applications/emulators/wine/packages.nix @@ -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 ]; diff --git a/pkgs/applications/emulators/wine/vkd3d.nix b/pkgs/applications/emulators/wine/vkd3d.nix deleted file mode 100644 index 249cb2730404..000000000000 --- a/pkgs/applications/emulators/wine/vkd3d.nix +++ /dev/null @@ -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 ]; - }; -} diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix index e48a82e766f7..7cf5533da7f2 100644 --- a/pkgs/top-level/wine-packages.nix +++ b/pkgs/top-level/wine-packages.nix @@ -38,7 +38,6 @@ rec { v4lSupport = stdenv.isLinux; gphoto2Support = true; krb5Support = true; - vkd3dSupport = stdenv.isLinux; embedInstallers = true; }; |