Skip to content

Commit 728ef7e

Browse files
committed
syslinux: get Debian patches from Arch Linux as well
1 parent 2cbbfdb commit 728ef7e

File tree

1 file changed

+4
-16
lines changed

1 file changed

+4
-16
lines changed

pkgs/by-name/sy/syslinux/package.nix

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@ stdenv.mkDerivation {
2828

2929
patches =
3030
let
31-
fetchDebianPatch =
32-
name: commit: hash:
33-
fetchurl {
34-
url = "https://salsa.debian.org/images-team/syslinux/raw/" + commit + "/debian/patches/" + name;
35-
inherit name hash;
36-
};
3731
archlinuxCommit = "db7884ec80642781edeead3e3bbd883a15b9b3ce";
3832
fetchArchlinuxPatch =
3933
name: hash:
@@ -44,27 +38,21 @@ stdenv.mkDerivation {
4438
in
4539
[
4640
./gcc10.patch
47-
(fetchDebianPatch "0002-gfxboot-menu-label.patch" "fa1349f1"
48-
"sha256-0f6QhM4lJmGflLige4n7AZTodL7vnyAvi5dIedd/Lho="
49-
)
41+
(fetchArchlinuxPatch "0002-gfxboot-menu-label.patch" "sha256-0f6QhM4lJmGflLige4n7AZTodL7vnyAvi5dIedd/Lho=")
5042
(fetchArchlinuxPatch "0005-gnu-efi-version-compatibility.patch" "sha256-hhCVnfbAFWj/R4yh60qsMB87ofW9RznarsByhl6L4tc=")
5143
(fetchArchlinuxPatch "0025-reproducible-build.patch" "sha256-mnb291pCSFvDNxY7o4BosJ94ib3BpOGRQIiY8Q3jZmI=")
52-
(fetchDebianPatch
44+
(fetchArchlinuxPatch
5345
# mbr.bin: too big (452 > 440)
5446
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=906414
5547
"0016-strip-gnu-property.patch"
56-
"7468ef0e38c43"
5748
"sha256-lW+E6THuXlTGvhly0f/D9NwYHhkiKHot2l+bz9Eaxp4="
5849
)
59-
(fetchDebianPatch
50+
(fetchArchlinuxPatch
6051
# mbr.bin: too big (452 > 440)
6152
"0017-single-load-segment.patch"
62-
"012e1dd312eb"
6353
"sha256-C6VmdlTs1blMGUHH3OfOlFBZsfpwRn9vWodwqVn8+Cs="
6454
)
65-
(fetchDebianPatch "0018-prevent-pow-optimization.patch" "26f0e7b2"
66-
"sha256-dVzXBi/oSV9vYgU85mRFHBKuZdup+1x1BipJX74ED7E="
67-
)
55+
(fetchArchlinuxPatch "0018-prevent-pow-optimization.patch" "sha256-dVzXBi/oSV9vYgU85mRFHBKuZdup+1x1BipJX74ED7E=")
6856
# Fixes build with "modern" gnu-efi
6957
./import-efisetjmp.patch
7058
# Upstream patch: https://www.syslinux.org/archives/2024-February/026903.html

0 commit comments

Comments
 (0)