diff options
| -rw-r--r-- | pkgs/os-specific/linux/syslinux/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
2 files changed, 11 insertions, 14 deletions
diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index 631bee80d94..5ebcef39e47 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -1,23 +1,26 @@ -{ stdenv, fetchurl, nasm, perl, libuuid }: +{ stdenv, fetchFromGitHub, nasm, perl, python, libuuid }: stdenv.mkDerivation rec { - name = "syslinux-6.03"; + name = "syslinux-2015-11-09"; - src = fetchurl { - url = "mirror://kernel/linux/utils/boot/syslinux/${name}.tar.xz"; - sha256 = "03l5iifwlg1wyb4yh98i0b7pd4j55a1c9y74q1frs47a5dnrilr6"; + src = fetchFromGitHub { + owner = "geneC"; + repo = "syslinux"; + rev = "0cc9a99e560a2f52bcf052fd85b1efae35ee812f"; + sha256 = "0wk3r5ki4lc334f9jpml07wpl8d0bnxi9h1l4h4fyf9a0d7n4kmw"; }; patches = [ ./perl-deps.patch ]; - buildInputs = [ nasm perl libuuid ]; + nativeBuildInputs = [ nasm perl python ]; + buildInputs = [ libuuid ]; enableParallelBuilding = false; # Fails very rarely with 'No rule to make target: ...' preBuild = '' substituteInPlace Makefile --replace /bin/pwd $(type -P pwd) substituteInPlace gpxe/src/Makefile.housekeeping --replace /bin/echo $(type -P echo) - substituteInPlace gpxe/src/Makefile --replace /usr/bin/perl $(type -P perl) + substituteInPlace utils/ppmtolss16 gpxe/src/Makefile --replace /usr/bin/perl $(type -P perl) ''; stripDebugList = "bin sbin share/syslinux/com32"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2749ba28e8d..7c47335ef39 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10331,13 +10331,7 @@ let sysklogd = callPackage ../os-specific/linux/sysklogd { }; - syslinux = callPackage ../os-specific/linux/syslinux { - # Using GCC5 with 6.03 creates a broken isolinux.bin - # Make sure to test booting the livecd on a bios system - # if changing this override. - # nixos.tests.bootBiosCdrom is useful for this. - stdenv = overrideCC stdenv gcc48; - }; + syslinux = callPackage ../os-specific/linux/syslinux { }; sysstat = callPackage ../os-specific/linux/sysstat { }; |