From 27d9cb9990fc72c09e44ab0ecc1dfff51cd1ef4d Mon Sep 17 00:00:00 2001 From: Quinn Edenfield Date: Sat, 2 May 2026 16:02:08 -0700 Subject: [PATCH] libkrun-efi: 1.17.4 -> 1.18.0 --- pkgs/by-name/li/libkrun-efi/package.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/li/libkrun-efi/package.nix b/pkgs/by-name/li/libkrun-efi/package.nix index 4dd223a7ef52..9548ff0d3f1c 100644 --- a/pkgs/by-name/li/libkrun-efi/package.nix +++ b/pkgs/by-name/li/libkrun-efi/package.nix @@ -20,13 +20,13 @@ withGpu ? true, }: let - version = "1.17.4"; + version = "1.18.0"; src = fetchFromGitHub { owner = "containers"; repo = "libkrun"; tag = "v${version}"; - hash = "sha256-Th4vCg3xHb6lbo26IDZES7tLOUAJTebQK2+h3xSYX7U="; + hash = "sha256-R7q52ZwiL9JsGofLPhXVTk/eH6bEob3DoZe21PHSBrU="; }; virglrenderer = stdenv.mkDerivation (finalAttrs: { @@ -78,7 +78,7 @@ let buildPhase = '' runHook preBuild cd init - $CC -O2 -static -Wall -o init init.c + $CC -O2 -static -Wall -o init init.c dhcp.c runHook postBuild ''; @@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-0xpAyNe1jF1OMtc7FXMsejqIv0xKc1ktEvm3rj/mVFU="; + hash = "sha256-3IAEWF+XGeKnb61SUpuVHMPiX6q0FgQFN4/eOBCH80c="; }; nativeBuildInputs = [ @@ -124,8 +124,12 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional withGpu "GPU=1"; - preBuild = '' - cp ${initBinary}/init init/init + env.KRUN_INIT_BINARY_PATH = "${initBinary}/init"; + + postPatch = '' + substituteInPlace Makefile --replace-fail \ + '$(LIBRARY_RELEASE_$(OS)): $(SYSROOT_TARGET) $(INIT_BINARY_BSD)' \ + '$(LIBRARY_RELEASE_$(OS)):' ''; passthru = {