movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 20:55:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

dxvk_1: fix build compatibility with GCC 14 (#360918)

Browse source
This commit is contained in:
Randy Eckenrode 2024-12-28 00:01:57 -05:00 • committed by GitHub
commit 9e09ce2d47
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
pkgs/by-name/dx/dxvk_1/gcc14-compat.patch Normal file
View file

@ -0,0 +1,14 @@
diff --git a/src/d3d10/d3d10_interfaces.h b/src/d3d10/d3d10_interfaces.h
index aa028ab575..99f1dc4567 100644
--- a/src/d3d10/d3d10_interfaces.h
+++ b/src/d3d10/d3d10_interfaces.h
@@ -1,9 +1,3 @@
#pragma once
#include "d3d10_include.h"
-
-#ifdef _MSC_VER
-struct __declspec(uuid("0803425a-57f5-4dd6-9465-a87570834a08")) ID3D10StateBlock;
-#else
-__CRT_UUID_DECL(ID3D10StateBlock, 0x0803425a,0x57f5,0x4dd6,0x94,0x65,0xa8,0x75,0x70,0x83,0x4a,0x08);
-#endif

2
pkgs/by-name/dx/dxvk_1/package.nix
View file

@ -29,6 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://github.com/doitsujin/dxvk/commit/1a5afc77b1859e6c7e31b55e11ece899e3b5295a.patch"; url = "https://github.com/doitsujin/dxvk/commit/1a5afc77b1859e6c7e31b55e11ece899e3b5295a.patch";
hash = "sha256-tTAsQOMAazgH/6laLNTuG2lki257VUR9EBivnD4vCuY="; hash = "sha256-tTAsQOMAazgH/6laLNTuG2lki257VUR9EBivnD4vCuY=";
}) })
# Fixes errors building with GCC 14.
./gcc14-compat.patch
] ]
++ lib.optionals enableMoltenVKCompat [ ++ lib.optionals enableMoltenVKCompat [
# Patch DXVK to work with MoltenVK even though it doesn’t support some required features. # Patch DXVK to work with MoltenVK even though it doesn’t support some required features.