public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

syslinux: fix build with new binutils

Browse Source 
Also fix the URL of the other patch.
This commit is contained in:
Vladimír Čunát 2019-01-29 22:12:54 +01:00
parent 555912067f
commit bce12effa7
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/os-specific/linux/syslinux/default.nix
View File

@ -10,15 +10,29 @@ stdenv.mkDerivation rec {
sha256 = "0wk3r5ki4lc334f9jpml07wpl8d0bnxi9h1l4h4fyf9a0d7n4kmw"; sha256 = "0wk3r5ki4lc334f9jpml07wpl8d0bnxi9h1l4h4fyf9a0d7n4kmw";
}; };
patches = [ patches = let
mkURL = commit: patchName:
"https://salsa.debian.org/images-team/syslinux/raw/${commit}/debian/patches/"
+ patchName;
in [
./perl-deps.patch ./perl-deps.patch
(fetchurl { (fetchurl {
# ldlinux.elf: Not enough room for program headers, try linking with -N # ldlinux.elf: Not enough room for program headers, try linking with -N
name = "not-enough-room.patch"; name = "not-enough-room.patch";
url = "https://anonscm.debian.org/cgit/collab-maint/syslinux.git/plain/" url = mkURL "a556ad7" "0014_fix_ftbfs_no_dynamic_linker.patch";
+ "debian/patches/0014_fix_ftbfs_no_dynamic_linker.patch?id=a556ad7";
sha256 = "0ijqjsjmnphmvsx0z6ppnajsfv6xh6crshy44i2a5klxw4nlvrsw"; 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 = '' postPatch = ''