From f5a7b7867921f66f7e10a2de4b3fc9fbe964353e Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Fri, 24 Mar 2023 20:51:46 +0000 Subject: [PATCH] rename kexec-tools-static it doesn't build natively on x86-64 and I don't suppose we need it to anyway --- modules/kexecboot.nix | 2 +- overlay.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/kexecboot.nix b/modules/kexecboot.nix index 4538afd..408c005 100644 --- a/modules/kexecboot.nix +++ b/modules/kexecboot.nix @@ -20,7 +20,7 @@ in { ln -s ${o.kernel} kernel ln -s ${o.manifest} manifest ln -s ${o.boot-sh} boot.sh - ln -s ${pkgs.kexec-tools}/bin/kexec ./kexec + ln -s ${pkgs.kexec-tools-static}/bin/kexec ./kexec ln -s ${o.dtb} dtb ''; diff --git a/overlay.nix b/overlay.nix index fc60fc7..ee90c20 100644 --- a/overlay.nix +++ b/overlay.nix @@ -16,7 +16,7 @@ in extraPkgs // { strace = prev.strace.override { libunwind = null; }; - kexec-tools = prev.kexec-tools.overrideAttrs(o: { + kexec-tools-static = prev.kexec-tools.overrideAttrs(o: { # For kexecboot we copy kexec into a ramdisk on the system being # upgraded from. This is more likely to work if kexec is # statically linked so doesn't have dependencies on store paths that