diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-04-23 11:49:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-23 11:49:25 -0500 |
| commit | 1439d0b9a2c3268cafd6fa84e2a2e3ceb9a237c6 (patch) | |
| tree | a4bab1d1043832f4ba57809cf6a4d73180eb6ed1 /pkgs/tools | |
| parent | 3678dca0e33d07fbf97ddddb290ef6bf6910393c (diff) | |
| parent | 8ae0c8a64f2f2e36b5815f8686e49a4c9315c09d (diff) | |
| download | nixlib-1439d0b9a2c3268cafd6fa84e2a2e3ceb9a237c6.tar nixlib-1439d0b9a2c3268cafd6fa84e2a2e3ceb9a237c6.tar.gz nixlib-1439d0b9a2c3268cafd6fa84e2a2e3ceb9a237c6.tar.bz2 nixlib-1439d0b9a2c3268cafd6fa84e2a2e3ceb9a237c6.tar.lz nixlib-1439d0b9a2c3268cafd6fa84e2a2e3ceb9a237c6.tar.xz nixlib-1439d0b9a2c3268cafd6fa84e2a2e3ceb9a237c6.tar.zst nixlib-1439d0b9a2c3268cafd6fa84e2a2e3ceb9a237c6.zip | |
Merge pull request #35685 from edef1c/ipxe-iso
ipxe: fix ISO build, update the package
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/misc/ipxe/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index 786b3992a5cc..d34ccaa4b9e9 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -3,8 +3,8 @@ }: let - date = "20170922"; - rev = "74d90b33f8490adcee2026ece18d8411d93b6a39"; + date = "20180220"; + rev = "47849be3a900c546cf92066849be0806f4e611d9"; in stdenv.mkDerivation { @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchgit { url = git://git.ipxe.org/ipxe.git; - sha256 = "12ijrq451fj2x3i7c7xjlxig5mwbhmgzqjvmfl2sza953vfbk4vw"; + sha256 = "1f4pi1dp2zqnrbfnggnzycfvrxv0bqgw73dxbyy3hfy4mhdj6z45"; inherit rev; }; @@ -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 ''; |