From 79a7cd6c55d0daa14ffabdec3fb1f29460909e58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 29 Jan 2019 22:12:54 +0100
Subject: [PATCH] syslinux: fix build with new binutils

Also fix the URL of the other patch.
---
 pkgs/os-specific/linux/syslinux/default.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix
index f02f1baafe6..4b8ff89cb7a 100644
--- a/pkgs/os-specific/linux/syslinux/default.nix
+++ b/pkgs/os-specific/linux/syslinux/default.nix
@@ -10,15 +10,24 @@ 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";
+    })
   ];
 
   postPatch = ''