From 9f3830cf6a1eed9ab124a5a90a7748c446279368 Mon Sep 17 00:00:00 2001 From: Vika Date: Wed, 8 Jul 2026 15:15:46 +0300 Subject: [PATCH] libkrunfw: keep `structuredAttrs` compatibility while allowing `kernelSrc` override This is useful for building forks of libkrunfw. --- pkgs/by-name/li/libkrunfw/package.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/li/libkrunfw/package.nix b/pkgs/by-name/li/libkrunfw/package.nix index c9598b861dcd..dedd6c90d58d 100644 --- a/pkgs/by-name/li/libkrunfw/package.nix +++ b/pkgs/by-name/li/libkrunfw/package.nix @@ -19,15 +19,16 @@ assert lib.elem variant [ "tdx" ]; -let +stdenv.mkDerivation (finalAttrs: { + pname = "libkrunfw" + lib.optionalString (variant != null) "-${variant}"; + version = "5.5.0"; + kernelSrc = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-6.12.91.tar.xz"; hash = "sha256-D/KrnhafnxlIVXRx+7RQ0wGPjFt3yvKI4aOYJYJZeWk="; }; -in -stdenv.mkDerivation (finalAttrs: { - pname = "libkrunfw" + lib.optionalString (variant != null) "-${variant}"; - version = "5.5.0"; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "libkrun"; @@ -38,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace Makefile \ - --replace-fail 'curl $(KERNEL_REMOTE) -o $(KERNEL_TARBALL)' 'ln -s ${kernelSrc} $(KERNEL_TARBALL)' + --replace-fail 'curl $(KERNEL_REMOTE) -o $(KERNEL_TARBALL)' 'ln -s ${finalAttrs.kernelSrc} $(KERNEL_TARBALL)' ''; nativeBuildInputs = [