diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2018-02-17 06:43:30 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-17 06:43:30 +0000 |
| commit | 90d34e7436aa3fdb4a331343459d10555b2babf8 (patch) | |
| tree | 13836d1c3307290f12b0c69453b1f51d2061d298 /pkgs/tools | |
| parent | 352519fcedd58c9d4e01b1a455a89752dc2725f2 (diff) | |
| parent | dbdb2f0eed59d81bd61fa5d042c583e31c91ad2f (diff) | |
| download | nixpkgs-90d34e7436aa3fdb4a331343459d10555b2babf8.tar nixpkgs-90d34e7436aa3fdb4a331343459d10555b2babf8.tar.gz nixpkgs-90d34e7436aa3fdb4a331343459d10555b2babf8.tar.bz2 nixpkgs-90d34e7436aa3fdb4a331343459d10555b2babf8.tar.lz nixpkgs-90d34e7436aa3fdb4a331343459d10555b2babf8.tar.xz nixpkgs-90d34e7436aa3fdb4a331343459d10555b2babf8.tar.zst nixpkgs-90d34e7436aa3fdb4a331343459d10555b2babf8.zip | |
Merge pull request #34935 from lheckemann/ipxe-embed
ipxe: enable parallel building; allow embed script
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/misc/ipxe/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index 2d36ad17eec..786b3992a5c 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchgit, perl, cdrkit, syslinux, xz, openssl }: +{ stdenv, lib, fetchgit, perl, cdrkit, syslinux, xz, openssl +, embedScript ? null +}: let date = "20170922"; @@ -24,7 +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" - ]; + ] ++ lib.optional (embedScript != null) "EMBED=${embedScript}"; enabledOptions = [ "DOWNLOAD_PROTO_HTTPS" ]; @@ -46,6 +48,8 @@ stdenv.mkDerivation { ln -s undionly.kpxe $out/undionly.kpxe.0 ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Network boot firmware"; homepage = http://ipxe.org/; |