diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-01-29 22:12:54 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-19 12:05:51 +0100 |
| commit | bce12effa7f4279d057acf437e7fdcafefd16557 (patch) | |
| tree | 7a7306c6d9dadf7bf82ff31d770269aad49f3817 /pkgs/os-specific/linux/syslinux | |
| parent | 555912067feac546fb1f8714113423b25e25cae1 (diff) | |
| download | nixpkgs-bce12effa7f4279d057acf437e7fdcafefd16557.tar nixpkgs-bce12effa7f4279d057acf437e7fdcafefd16557.tar.gz nixpkgs-bce12effa7f4279d057acf437e7fdcafefd16557.tar.bz2 nixpkgs-bce12effa7f4279d057acf437e7fdcafefd16557.tar.lz nixpkgs-bce12effa7f4279d057acf437e7fdcafefd16557.tar.xz nixpkgs-bce12effa7f4279d057acf437e7fdcafefd16557.tar.zst nixpkgs-bce12effa7f4279d057acf437e7fdcafefd16557.zip | |
syslinux: fix build with new binutils
Also fix the URL of the other patch.
Diffstat (limited to 'pkgs/os-specific/linux/syslinux')
| -rw-r--r-- | pkgs/os-specific/linux/syslinux/default.nix | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index cb325964313..8965b5da4f4 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -10,15 +10,29 @@ stdenv.mkDerivation rec { sha256 = "0wk3r5ki4lc334f9jpml07wpl8d0bnxi9h1l4h4fyf9a0d7n4kmw"; }; - patches = [ + patches = let + mkURL = commit: patchName: + "https://salsa.debian.org/images-team/syslinux/raw/${commit}/debian/patches/" + + patchName; + in [ ./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"; + url = mkURL "a556ad7" "0014_fix_ftbfs_no_dynamic_linker.patch"; sha256 = "0ijqjsjmnphmvsx0z6ppnajsfv6xh6crshy44i2a5klxw4nlvrsw"; }) + (fetchurl { + # mbr.bin: too big (452 > 440) + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=906414 + url = mkURL "7468ef0e38c43" "0016-strip-gnu-property.patch"; + sha256 = "17n63b8wz6szv8npla1234g1ip7lqgzx2whrpv358ppf67lq8vwm"; + }) + (fetchurl { + # mbr.bin: too big (452 > 440) + url = mkURL "012e1dd312eb" "0017-single-load-segment.patch"; + sha256 = "0azqzicsjw47b9ppyikhzaqmjl4lrvkxris1356bkmgcaiv6d98b"; + }) ]; postPatch = '' |