Skip to content

Commit

Permalink
dxvk_2: 2.4 -> 2.5 (NixOS#355274)
Browse files Browse the repository at this point in the history
  • Loading branch information
reckenrode authored Nov 18, 2024
2 parents 45533e4 + e0d0c39 commit d42089b
Showing 1 changed file with 23 additions and 2 deletions.
25 changes: 23 additions & 2 deletions pkgs/by-name/dx/dxvk_2/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch2,
pkgsBuildHost,
glslang,
meson,
Expand Down Expand Up @@ -37,16 +38,29 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "dxvk";
version = "2.4";
version = "2.5";

src = fetchFromGitHub {
owner = "doitsujin";
repo = "dxvk";
rev = "v${finalAttrs.version}";
hash = "sha256-4U0Z1oR0BKIHZ6YNT/+8sFe2I/ZKmPecInMXUho4MHg=";
hash = "sha256-JwEKmzYnoDhad0VKadQYEqraMogXn7BFI9kmT9F+Ts0=";
fetchSubmodules = true; # Needed for the DirectX headers and libdisplay-info
};

patches = [
# Fixes `ERROR: Index 2 out of bounds of array of size 2` error on native builds.
(fetchpatch2 {
url = "https://github.com/doitsujin/dxvk/commit/e6209d28cd9c51ad371605db4c0de27547c0d28c.patch?full_index=1";
hash = "sha256-zKO6YXOUKBnwcijzCldDzmDqXSkf+wWe9KmUlhsaTyM=";
})
# Fixes missing symbol error when building with GLFW support enabled.
(fetchpatch2 {
url = "https://github.com/doitsujin/dxvk/commit/62ef4854a6accf2b042f25f44db667abadc0b3fd.patch?full_index=1";
hash = "sha256-oXybFqoD68gTLHO1kDHll4XCfpU+s9E+PmaXQFqEy/g=";
})
];

postPatch =
''
substituteInPlace meson.build \
Expand Down Expand Up @@ -102,5 +116,12 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.zlib;
badPlatforms = lib.platforms.darwin;
platforms = lib.platforms.windows ++ lib.platforms.unix;
pkgConfigModules = [
"dxvk-d3d10core"
"dxvk-d3d11"
"dxvk-d3d8"
"dxvk-d3d9"
"dxvk-dxgi"
];
};
})

0 comments on commit d42089b

Please sign in to comment.