From 555b7a818d53b503b74ecf8e471a0f1ed1b6226d Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sun, 26 Jan 2025 02:18:00 +0100 Subject: [PATCH 1/2] vulkan-memory-allocator: 3.1.0 -> 3.2.0 --- .../vu/vulkan-memory-allocator/package.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/vu/vulkan-memory-allocator/package.nix b/pkgs/by-name/vu/vulkan-memory-allocator/package.nix index b2446d86ded3..281afa72b5f3 100644 --- a/pkgs/by-name/vu/vulkan-memory-allocator/package.nix +++ b/pkgs/by-name/vu/vulkan-memory-allocator/package.nix @@ -2,31 +2,20 @@ lib, stdenvNoCC, fetchFromGitHub, - fetchpatch, cmake, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "vulkan-memory-allocator"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "GPUOpen-LibrariesAndSDKs"; repo = "VulkanMemoryAllocator"; tag = "v${finalAttrs.version}"; - hash = "sha256-j0Z9OEwQx3RB2cni9eK3gYfwkhOc2ST213b6VseaVzg="; + hash = "sha256-f9TmMUbWqS00Ib3gpPQpd/0D02nDBUgYvPJ8rSFizFY="; }; - patches = [ - # Allows specifying version constraints on the CMake module - # Remove when version > 3.1.0 - (fetchpatch { - name = "0001-vulkan-memory-allocator-add-cmake-package-version-file.patch"; - url = "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/commit/257138b8f5686ae84491a3df9f90a77d5660c3bd.patch"; - hash = "sha256-qbQhIJho/WQqzAwB2zzWgGKx4QK9zKmbaGisbNOV8mg="; - }) - ]; - # A compiler is only required for the samples. This lets us use stdenvNoCC. postPatch = '' substituteInPlace CMakeLists.txt \ From 0c67c3b6dd47bfcb80a053c6b91518c82be95218 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sun, 26 Jan 2025 02:04:17 +0100 Subject: [PATCH 2/2] vulkan-memory-allocator: add nix-update-script --- pkgs/by-name/vu/vulkan-memory-allocator/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/vu/vulkan-memory-allocator/package.nix b/pkgs/by-name/vu/vulkan-memory-allocator/package.nix index 281afa72b5f3..f7c34918daa3 100644 --- a/pkgs/by-name/vu/vulkan-memory-allocator/package.nix +++ b/pkgs/by-name/vu/vulkan-memory-allocator/package.nix @@ -3,6 +3,7 @@ stdenvNoCC, fetchFromGitHub, cmake, + nix-update-script, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -28,6 +29,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { strictDeps = true; + passthru.updateScript = nix-update-script { }; + meta = { description = "Easy to integrate Vulkan memory allocation library"; homepage = "https://gpuopen.com/vulkan-memory-allocator/";