From 2ebf6c55e6b3e42e152510b541a3463b3cbb6870 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 30 May 2026 18:21:02 +0200 Subject: [PATCH] libkrunfw: fix build with structuredAttrs, use --replace-fail --- 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 73120ed22c99..aa5c19c4a513 100644 --- a/pkgs/by-name/li/libkrunfw/package.nix +++ b/pkgs/by-name/li/libkrunfw/package.nix @@ -19,6 +19,12 @@ assert lib.elem variant [ "tdx" ]; +let + kernelSrc = fetchurl { + url = "mirror://kernel/linux/kernel/v6.x/linux-6.12.76.tar.xz"; + hash = "sha256-u7Q+g0xG5r1JpcKPIuZ5qTdENATh9lMgTUskkp862JY="; + }; +in stdenv.mkDerivation (finalAttrs: { pname = "libkrunfw" + lib.optionalString (variant != null) "-${variant}"; version = "5.3.0"; @@ -30,14 +36,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-fhG/bP1HzmhyU2N+wnr1074WEGsD9RdTUUBhYUFpWlA="; }; - kernelSrc = fetchurl { - url = "mirror://kernel/linux/kernel/v6.x/linux-6.12.76.tar.xz"; - hash = "sha256-u7Q+g0xG5r1JpcKPIuZ5qTdENATh9lMgTUskkp862JY="; - }; - postPatch = '' substituteInPlace Makefile \ - --replace 'curl $(KERNEL_REMOTE) -o $(KERNEL_TARBALL)' 'ln -s $(kernelSrc) $(KERNEL_TARBALL)' + --replace-fail 'curl $(KERNEL_REMOTE) -o $(KERNEL_TARBALL)' 'ln -s ${kernelSrc} $(KERNEL_TARBALL)' ''; nativeBuildInputs = [