From 25a875195d8975460393aea03f0d02dc8ceb24ee Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 28 Jan 2013 15:45:33 +0100 Subject: [PATCH] syslinux: Update to 4.06 and fix build http://hydra.nixos.org/build/3890519 --- pkgs/os-specific/linux/syslinux/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index 1287da097ca7..98917f943f51 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchurl, nasm, perl }: +{ stdenv, fetchurl, nasm, perl, libuuid }: stdenv.mkDerivation rec { - name = "syslinux-4.03"; - + name = "syslinux-4.06"; + src = fetchurl { url = "mirror://kernel/linux/utils/boot/syslinux/4.xx/${name}.tar.bz2"; - sha256 = "0f6s1cnibw6j0jh9bn5qsx3vsar9l1w9b3xfjkvzglgr4kinfmf6"; + sha256 = "09md61npd5z64rv5s3knl4qsn2bqsn57irm5izk6snf46r77gdyv"; }; patches = [ ./perl-deps.patch ]; - - buildInputs = [ nasm perl ]; + + buildInputs = [ nasm perl libuuid ]; + + enableParallelBuilding = true; preBuild = '' @@ -18,4 +20,9 @@ stdenv.mkDerivation rec { substituteInPlace gpxe/src/Makefile --replace /usr/bin/perl $(type -P perl) makeFlagsArray=(BINDIR=$out/bin SBINDIR=$out/sbin LIBDIR=$out/lib INCDIR=$out/include DATADIR=$out/share MANDIR=$out/share/man PERL=perl) ''; + + meta = { + homepage = http://www.syslinux.org/; + description = "A lightweight bootloader"; + }; }