diff --git a/pkgs/by-name/qm/qmplay2/package.nix b/pkgs/by-name/qm/qmplay2/package.nix index 3f88b90470af..5ce404e93cbc 100644 --- a/pkgs/by-name/qm/qmplay2/package.nix +++ b/pkgs/by-name/qm/qmplay2/package.nix @@ -29,6 +29,9 @@ let sources = callPackage ./sources.nix { }; + vulkan-headers-qmplay2 = vulkan-headers.overrideAttrs (oldAttrs: { + inherit (sources.vulkan-headers-qmplay2) version src; + }); in assert lib.elem qtVersion [ "5" @@ -43,8 +46,6 @@ stdenv.mkDerivation (finalAttrs: { cp -va ${sources.qmvk.src}/* qmvk/ chmod --recursive 744 qmvk popd - substituteInPlace src/qmplay2/vulkan/VulkanWindow.cpp \ - --replace-fail "getSubmitInfo()" "getSubmitInfo(0)" ''; nativeBuildInputs = [ @@ -70,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { libva libxcb taglib - vulkan-headers + vulkan-headers-qmplay2 vulkan-tools ] ++ lib.optionals (qtVersion == "6") [ diff --git a/pkgs/by-name/qm/qmplay2/sources.nix b/pkgs/by-name/qm/qmplay2/sources.nix index 2ddfe376a38b..58ab4a6cb99d 100644 --- a/pkgs/by-name/qm/qmplay2/sources.nix +++ b/pkgs/by-name/qm/qmplay2/sources.nix @@ -5,14 +5,29 @@ let self = { pname = "qmplay2"; - version = "25.01.19"; + version = "25.06.27"; src = fetchFromGitHub { owner = "zaps166"; repo = "QMPlay2"; tag = self.version; - hash = "sha256-Of/zEQ6o2J/wXfAoY10IPtCaMaSk8ux8L6MrimeMWVA="; - fetchSubmodules = true; + hash = "sha256-+kDaRKwXOHnHje1RntC9y9xiTaMzs8SGMLVoJ+6IDNk="; + }; + }; + in + self; + + vulkan-headers-qmplay2 = + let + self = { + pname = "vulkan-headers"; + version = "1.3.300"; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "Vulkan-Headers"; + tag = "v${self.version}"; + hash = "sha256-6J+6yvbEQXLY+Wkf1pWKtUAZGbe5Tc01uVh3Wqmk2+8="; }; }; in