From 65e3bf3236ddf89fafd11ad92728b022d84267ef Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Wed, 27 May 2026 17:54:57 -0500 Subject: [PATCH 1/2] vkbasalt: move let binding into file --- pkgs/tools/graphics/vkbasalt/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/vkbasalt/default.nix b/pkgs/tools/graphics/vkbasalt/default.nix index 5b7257b24903..d64dfd679949 100644 --- a/pkgs/tools/graphics/vkbasalt/default.nix +++ b/pkgs/tools/graphics/vkbasalt/default.nix @@ -9,9 +9,12 @@ libx11, spirv-headers, vulkan-headers, - vkbasalt32, + pkgsi686Linux, }: +let + vkbasalt32 = pkgsi686Linux.vkbasalt; +in stdenv.mkDerivation (finalAttrs: { pname = "vkbasalt"; version = "0.3.2.10"; From 5fb8102c19ad35cb905e9a39c08873dbfc234fe6 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Wed, 27 May 2026 17:56:31 -0500 Subject: [PATCH 2/2] vkbasalt: migrate to by-name --- .../vkbasalt/default.nix => by-name/vk/vkbasalt/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 4 deletions(-) rename pkgs/{tools/graphics/vkbasalt/default.nix => by-name/vk/vkbasalt/package.nix} (100%) diff --git a/pkgs/tools/graphics/vkbasalt/default.nix b/pkgs/by-name/vk/vkbasalt/package.nix similarity index 100% rename from pkgs/tools/graphics/vkbasalt/default.nix rename to pkgs/by-name/vk/vkbasalt/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f2b40617728..4e8460e2ca69 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3351,10 +3351,6 @@ with pkgs; vimwiki-markdown = python3Packages.callPackage ../tools/misc/vimwiki-markdown { }; - vkbasalt = callPackage ../tools/graphics/vkbasalt { - vkbasalt32 = pkgsi686Linux.vkbasalt; - }; - voxtype-vulkan = callPackage ../by-name/vo/voxtype/package.nix { vulkanSupport = true; }; voxtype-onnx = callPackage ../by-name/vo/voxtype/package.nix { onnxSupport = true; };