diff --git a/pkgs/by-name/sy/syslinux/gcc10.patch b/pkgs/by-name/sy/syslinux/gcc10.patch deleted file mode 100644 index f4893a912313..000000000000 --- a/pkgs/by-name/sy/syslinux/gcc10.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/dos/string.h b/dos/string.h -index f648de2..a502132 100644 ---- a/dos/string.h -+++ b/dos/string.h -@@ -5,12 +5,13 @@ - #ifndef _STRING_H - #define _STRING_H - -+#include -+ - /* Standard routines */ - #define memcpy(a,b,c) __builtin_memcpy(a,b,c) - #define memmove(a,b,c) __builtin_memmove(a,b,c) - #define memset(a,b,c) __builtin_memset(a,b,c) - #define strcpy(a,b) __builtin_strcpy(a,b) --#define strlen(a) __builtin_strlen(a) - - /* This only returns true or false */ - static inline int memcmp(const void *__m1, const void *__m2, unsigned int __n) -@@ -21,6 +22,13 @@ static inline int memcmp(const void *__m1, const void *__m2, unsigned int __n) - return rv; - } - -+static inline size_t strlen(const char *s) -+{ -+ size_t len = 0; -+ while (*s++) len++; -+ return len; -+} -+ - extern char *strchr(const char *s, int c); - - #endif /* _STRING_H */ diff --git a/pkgs/by-name/sy/syslinux/package.nix b/pkgs/by-name/sy/syslinux/package.nix index c1d4b276860b..717327cd1cd0 100644 --- a/pkgs/by-name/sy/syslinux/package.nix +++ b/pkgs/by-name/sy/syslinux/package.nix @@ -36,9 +36,9 @@ stdenv.mkDerivation { }; in [ - ./gcc10.patch (fetchArchlinuxPatch "0002-gfxboot-menu-label.patch" "sha256-eoId3jn4eRxItil5naoGMBGOJM/p5FG74ePwxiJ0w/8=") (fetchArchlinuxPatch "0005-gnu-efi-version-compatibility.patch" "sha256-5oZ/24emWNPHx621v/9i2xU6rodpVCM0R18hCU35eDk=") + (fetchArchlinuxPatch "0006-Replace-builtin-strlen-that-appears-to-get-optimized.patch" "sha256-aq2vKqGonhMI2gRrAYNe+VRD8Vwijn7kOOv5wqAncx8=") (fetchArchlinuxPatch "0025-reproducible-build.patch" "sha256-vhth9CFHqChPQPgGhUWVpYwMFnnjoMVIGr7Wfu1jcDY=") (fetchArchlinuxPatch # mbr.bin: too big (452 > 440)