pyrox.dev
Merge branch 'master.upstream' into staging.upstream
+2
-1
pkgs/os-specific/linux/syslinux/default.nix
+2
-1
pkgs/os-specific/linux/syslinux/default.nix
···
8
8
sha256 = "03l5iifwlg1wyb4yh98i0b7pd4j55a1c9y74q1frs47a5dnrilr6";
9
9
};
10
10
11
-
patches = [ ./perl-deps.patch ];
11
+
# gcc5-fix should be in 6.04+, so remove if it fails to apply.
12
+
patches = [ ./perl-deps.patch ./gcc5-fix.patch ];
12
13
13
14
buildInputs = [ nasm perl libuuid ];
14
15
+26
pkgs/os-specific/linux/syslinux/gcc5-fix.patch
+26
pkgs/os-specific/linux/syslinux/gcc5-fix.patch
···
1
+
diff --git a/com32/include/menu.h b/com32/include/menu.h
2
+
index bc0182f..b0251e4 100644
3
+
--- a/com32/include/menu.h
4
+
+++ b/com32/include/menu.h
5
+
@@ -195,7 +195,7 @@ void local_cursor_enable(bool);
6
+
7
+
static inline int my_isspace(char c)
8
+
{
9
+
- return (unsigned char)c <= ' ';
10
+
+ return (unsigned char)c <= ' ' || (unsigned char)c == '\x7f';
11
+
}
12
+
13
+
int my_isxdigit(char c);
14
+
diff --git a/com32/menu/readconfig.c b/com32/menu/readconfig.c
15
+
index b7814be..a433fad 100644
16
+
--- a/com32/menu/readconfig.c
17
+
+++ b/com32/menu/readconfig.c
18
+
@@ -299,7 +299,7 @@ static char *copy_sysappend_string(char *dst, const char *src)
19
+
char c;
20
+
21
+
while ((c = *src++)) {
22
+
- if (c <= ' ' && c == '\x7f') {
23
+
+ if (my_isspace(c)) {
24
+
if (!was_space)
25
+
*dst++ = '_';
26
+
was_space = true;