From ff3574c816eefa896d6fd9172243771d21f38da5 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Thu, 18 Dec 2025 00:39:53 -0500 Subject: [PATCH] ramalama: wrap all deps when withPodman==false, except podman Before the change, ramalama erroneously excluded all deps from wrapProgram if withPodman was false. Now only podman inclusion in the closure is controlled by withPodman argument; other deps are always included. (cherry picked from commit 328e46f2d512c281fa139e52981228793605120d) --- pkgs/by-name/ra/ramalama/package.nix | 30 ++++++++++++++-------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/ra/ramalama/package.nix b/pkgs/by-name/ra/ramalama/package.nix index d3ca8cfaded3..af3af90d36c3 100644 --- a/pkgs/by-name/ra/ramalama/package.nix +++ b/pkgs/by-name/ra/ramalama/package.nix @@ -50,21 +50,21 @@ python3Packages.buildPythonApplication (finalAttrs: { make docs ''; - postInstall = lib.optionalString withPodman '' - wrapProgram $out/bin/ramalama \ - --prefix PATH : ${ - lib.makeBinPath ( - [ - llama-cpp-vulkan - podman - ] - ++ (with python3Packages; [ - huggingface-hub - mlx-lm - ]) - ) - } - ''; + postInstall = + let + binPackages = [ + llama-cpp-vulkan + ] + ++ (with python3Packages; [ + huggingface-hub + mlx-lm + ]) + ++ lib.optional withPodman podman; + in + '' + wrapProgram $out/bin/ramalama \ + --prefix PATH : ${lib.makeBinPath binPackages} + ''; pythonImportsCheck = [ "ramalama"