JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #35685 from edef1c/ipxe-iso

Browse Source 
ipxe: fix ISO build, update the package
This commit is contained in:
Matthew Justin Bauer 2018-04-23 11:49:25 -05:00 committed by GitHub
commit 1439d0b9a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/tools/misc/ipxe/default.nix
View File

@ -3,8 +3,8 @@
}: }:
let let
date = "20170922"; date = "20180220";
rev = "74d90b33f8490adcee2026ece18d8411d93b6a39"; rev = "47849be3a900c546cf92066849be0806f4e611d9";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -14,7 +14,7 @@ stdenv.mkDerivation {
src = fetchgit { src = fetchgit {
url = git://git.ipxe.org/ipxe.git; url = git://git.ipxe.org/ipxe.git;
sha256 = "12ijrq451fj2x3i7c7xjlxig5mwbhmgzqjvmfl2sza953vfbk4vw"; sha256 = "1f4pi1dp2zqnrbfnggnzycfvrxv0bqgw73dxbyy3hfy4mhdj6z45";
inherit rev; inherit rev;
}; };
@ -26,6 +26,7 @@ stdenv.mkDerivation {
makeFlags = makeFlags =
[ "ECHO_E_BIN_ECHO=echo" "ECHO_E_BIN_ECHO_E=echo" # No /bin/echo here. [ "ECHO_E_BIN_ECHO=echo" "ECHO_E_BIN_ECHO_E=echo" # No /bin/echo here.
"ISOLINUX_BIN_LIST=${syslinux}/share/syslinux/isolinux.bin" "ISOLINUX_BIN_LIST=${syslinux}/share/syslinux/isolinux.bin"
"LDLINUX_C32=${syslinux}/share/syslinux/ldlinux.c32"
] ++ lib.optional (embedScript != null) "EMBED=${embedScript}"; ] ++ lib.optional (embedScript != null) "EMBED=${embedScript}";
@ -34,6 +35,7 @@ stdenv.mkDerivation {
configurePhase = '' configurePhase = ''
runHook preConfigure runHook preConfigure
for opt in $enabledOptions; do echo "#define $opt" >> src/config/general.h; done 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 runHook postConfigure
''; '';