diff options
| author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2019-02-09 22:34:11 -0500 |
|---|---|---|
| committer | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2019-02-09 23:21:14 -0500 |
| commit | 0b49d5dd687a540c259400c1082ea660b9b9961a (patch) | |
| tree | 9b5272bdf26de1cbf61bb46db1f97197b7f81f56 /pkgs/os-specific/linux/syslinux/default.nix | |
| parent | 13b0c17932ae03b1ed04a93f1ca06c8baeb24530 (diff) | |
| download | nixlib-0b49d5dd687a540c259400c1082ea660b9b9961a.tar nixlib-0b49d5dd687a540c259400c1082ea660b9b9961a.tar.gz nixlib-0b49d5dd687a540c259400c1082ea660b9b9961a.tar.bz2 nixlib-0b49d5dd687a540c259400c1082ea660b9b9961a.tar.lz nixlib-0b49d5dd687a540c259400c1082ea660b9b9961a.tar.xz nixlib-0b49d5dd687a540c259400c1082ea660b9b9961a.tar.zst nixlib-0b49d5dd687a540c259400c1082ea660b9b9961a.zip | |
syslinux: 2015-11-09 -> 2019-02-07
Diffstat (limited to 'pkgs/os-specific/linux/syslinux/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/syslinux/default.nix | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index cb3259643139..2562bb7e260b 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -1,31 +1,19 @@ -{ stdenv, fetchFromGitHub, fetchurl, nasm, perl, python, libuuid, mtools, makeWrapper }: +{ stdenv, fetchFromRepoOrCz, fetchpatch, nasm, perl, python, libuuid, mtools, makeWrapper }: stdenv.mkDerivation rec { - name = "syslinux-2015-11-09"; + # This is syslinux-6.04-pre3^1; syslinux-6.04-pre3 fails to run. + # Same issue here https://www.syslinux.org/archives/2019-February/026330.html + name = "syslinux-2019-02-07"; - src = fetchFromGitHub { - owner = "geneC"; + src = fetchFromRepoOrCz { repo = "syslinux"; - rev = "0cc9a99e560a2f52bcf052fd85b1efae35ee812f"; - sha256 = "0wk3r5ki4lc334f9jpml07wpl8d0bnxi9h1l4h4fyf9a0d7n4kmw"; + rev = "b40487005223a78c3bb4c300ef6c436b3f6ec1f7"; + sha256 = "1qrxl1114sr2i2791z9rf8v53g200aq30f08808d7i8qnmgvxl2w"; }; - patches = [ - ./perl-deps.patch - (fetchurl { - # ldlinux.elf: Not enough room for program headers, try linking with -N - name = "not-enough-room.patch"; - url = "https://anonscm.debian.org/cgit/collab-maint/syslinux.git/plain/" - + "debian/patches/0014_fix_ftbfs_no_dynamic_linker.patch?id=a556ad7"; - sha256 = "0ijqjsjmnphmvsx0z6ppnajsfv6xh6crshy44i2a5klxw4nlvrsw"; - }) - ]; - postPatch = '' substituteInPlace Makefile --replace /bin/pwd $(type -P pwd) - substituteInPlace gpxe/src/Makefile.housekeeping --replace /bin/echo $(type -P echo) substituteInPlace utils/ppmtolss16 --replace /usr/bin/perl $(type -P perl) - substituteInPlace gpxe/src/Makefile --replace /usr/bin/perl $(type -P perl) # fix tests substituteInPlace tests/unittest/include/unittest/unittest.h \ |