From bcfe493a986fd2552407726b9339ef3ec21ff9a8 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 23 Aug 2026 22:37:55 +0200
Subject: [PATCH 1/2] llama-cpp: enable __structuredAttrs and strictDeps

---
 pkgs/by-name/ll/llama-cpp/package.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix
index 9c2052226593..6ef0a02341a7 100644
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -54,7 +54,6 @@ let
     cmakeBool
     cmakeFeature
     optionals
-    optionalString
     ;
 
   cudaBuildInputs = with cudaPackages; [
@@ -73,7 +72,7 @@ let
   ];
 
   vulkanBuildInputs = [
-    shaderc
+    spirv-headers
     vulkan-headers
     vulkan-loader
   ];
@@ -82,6 +81,9 @@ effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "llama-cpp";
   version = "10408";
 
+  __structuredAttrs = true;
+  strictDeps = true;
+
   outputs = [
     "out"
     "dev"
@@ -108,11 +110,14 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     nodejs_latest
     npmHooks.npmConfigHook
     pkg-config
-    spirv-headers
   ]
   ++ optionals cudaSupport [
     cudaPackages.cuda_nvcc
     autoAddDriverRunpath
+  ]
+  # `glslc` is used at build time to compile the shaders
+  ++ optionals vulkanSupport [
+    shaderc
   ];
 
   buildInputs =

From da384d29c976140f1185acf4364a79fdeea1cd7b Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 23 Aug 2026 22:38:33 +0200
Subject: [PATCH 2/2] llama-cpp: add cuda to meta.teams

---
 pkgs/by-name/ll/llama-cpp/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix
index 6ef0a02341a7..bd6467d60dba 100644
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -221,6 +221,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
       xddxdd
       yuannan
     ];
+    teams = [ lib.teams.cuda ];
     platforms = lib.platforms.unix;
     badPlatforms = optionals (cudaSupport || openclSupport) lib.platforms.darwin;
     broken = metalSupport && !effectiveStdenv.hostPlatform.isDarwin;