From dd6c7096d629d9c6814c6980180254d3336a9a3b Mon Sep 17 00:00:00 2001 From: Payas Relekar Date: Sat, 19 Mar 2022 20:08:44 +0530 Subject: wine{unstable,staging}: 7.2 -> 7.4, vkd3d: 1.2 -> 1.3 --- pkgs/applications/emulators/wine/sources.nix | 6 +++--- pkgs/applications/emulators/wine/vkd3d.nix | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index b98aceddbd4..23538a237e4 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -46,9 +46,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "7.2"; + version = "7.4"; url = "https://dl.winehq.org/wine/source/7.x/wine-${version}.tar.xz"; - sha256 = "sha256-38ZBUjyNvGZBaLYXREFjPZcSdUVr9n3i3KqZyNql7hU="; + sha256 = "sha256-co6GbW5JzpKioMUUMz6f8Ivb9shvXvTmGAFDuNK31BY="; inherit (stable) gecko32 gecko64 patches; mono = fetchurl rec { @@ -61,7 +61,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-Ec9rienlsDg+2QkJqPrGorDb5NycG1/iGWhnqLZOrwg="; + sha256 = "0vlj3b8bnidyhlgkjrnlbah3878zjy3s557vbp16qka42zjaa51q"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/pkgs/applications/emulators/wine/vkd3d.nix b/pkgs/applications/emulators/wine/vkd3d.nix index ac7c399cd97..4f06b886e23 100644 --- a/pkgs/applications/emulators/wine/vkd3d.nix +++ b/pkgs/applications/emulators/wine/vkd3d.nix @@ -1,16 +1,18 @@ -{ lib, stdenv, fetchurl, moltenvk, vulkan-headers, spirv-headers, vulkan-loader }: +{ lib, stdenv, fetchurl, moltenvk, vulkan-headers, spirv-headers, vulkan-loader, flex, bison }: #TODO: unstable stdenv.mkDerivation rec { pname = "vkd3d"; - version = "1.2"; + version = "1.3"; src = fetchurl { url = "https://dl.winehq.org/vkd3d/source/vkd3d-${version}.tar.xz"; - sha256 = "0szr1lw3xbgi9qjm13d1q4gyzzwv8i5wfxiwjg6dmwphrc7h6jxh"; + sha256 = "134b347806d34a4d2b39ea29ff1c2b38443793803a3adc50800855bb929fb8b2"; }; + nativeBuildInputs = [ flex bison ]; + buildInputs = [ vulkan-headers spirv-headers ] ++ [ (if stdenv.isDarwin then moltenvk else vulkan-loader) ]; -- cgit 1.4.1