From 4d7bea7e5efa873b5469af996a0d99ca529ba50f Mon Sep 17 00:00:00 2001 From: edef Date: Mon, 26 Feb 2018 17:50:56 -0500 Subject: [PATCH] ipxe: fix ISO build Without this change, it doesn't seem to properly generate ISOs with embedded scripts. --- pkgs/tools/misc/ipxe/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index 786b3992a5cc..1cce03fe74e0 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation { makeFlags = [ "ECHO_E_BIN_ECHO=echo" "ECHO_E_BIN_ECHO_E=echo" # No /bin/echo here. "ISOLINUX_BIN_LIST=${syslinux}/share/syslinux/isolinux.bin" + "LDLINUX_C32=${syslinux}/share/syslinux/ldlinux.c32" ] ++ lib.optional (embedScript != null) "EMBED=${embedScript}"; @@ -34,6 +35,7 @@ stdenv.mkDerivation { configurePhase = '' runHook preConfigure for opt in $enabledOptions; do echo "#define $opt" >> src/config/general.h; done + sed -i '/cp \''${ISOLINUX_BIN}/s/$/ --no-preserve=mode/' src/util/geniso runHook postConfigure '';