diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-07-17 22:38:45 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-09-15 12:14:12 -0700 |
| commit | 3000e55b06243c3699e55c90bfc6ecfe409a5aae (patch) | |
| tree | 840892b729bd45a699473b8181f0571121a2d413 /pkgs/os-specific | |
| parent | f4a42ae509216463e774843ffabc75399532a717 (diff) | |
| download | nixlib-3000e55b06243c3699e55c90bfc6ecfe409a5aae.tar nixlib-3000e55b06243c3699e55c90bfc6ecfe409a5aae.tar.gz nixlib-3000e55b06243c3699e55c90bfc6ecfe409a5aae.tar.bz2 nixlib-3000e55b06243c3699e55c90bfc6ecfe409a5aae.tar.lz nixlib-3000e55b06243c3699e55c90bfc6ecfe409a5aae.tar.xz nixlib-3000e55b06243c3699e55c90bfc6ecfe409a5aae.tar.zst nixlib-3000e55b06243c3699e55c90bfc6ecfe409a5aae.zip | |
syslinux: Use gcc 4.8 until a proper fix for 5 is made
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/syslinux/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/syslinux/gcc5-fix.patch | 26 |
2 files changed, 1 insertions, 28 deletions
diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index 3c01516b0815..93e5d591a9d9 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -8,8 +8,7 @@ stdenv.mkDerivation rec { sha256 = "03l5iifwlg1wyb4yh98i0b7pd4j55a1c9y74q1frs47a5dnrilr6"; }; - # gcc5-fix should be in 6.04+, so remove if it fails to apply. - patches = [ ./perl-deps.patch ./gcc5-fix.patch ]; + patches = [ ./perl-deps.patch ]; buildInputs = [ nasm perl libuuid ]; diff --git a/pkgs/os-specific/linux/syslinux/gcc5-fix.patch b/pkgs/os-specific/linux/syslinux/gcc5-fix.patch deleted file mode 100644 index dc44b1880583..000000000000 --- a/pkgs/os-specific/linux/syslinux/gcc5-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/com32/include/menu.h b/com32/include/menu.h -index bc0182f..b0251e4 100644 ---- a/com32/include/menu.h -+++ b/com32/include/menu.h -@@ -195,7 +195,7 @@ void local_cursor_enable(bool); - - static inline int my_isspace(char c) - { -- return (unsigned char)c <= ' '; -+ return (unsigned char)c <= ' ' || (unsigned char)c == '\x7f'; - } - - int my_isxdigit(char c); -diff --git a/com32/menu/readconfig.c b/com32/menu/readconfig.c -index b7814be..a433fad 100644 ---- a/com32/menu/readconfig.c -+++ b/com32/menu/readconfig.c -@@ -299,7 +299,7 @@ static char *copy_sysappend_string(char *dst, const char *src) - char c; - - while ((c = *src++)) { -- if (c <= ' ' && c == '\x7f') { -+ if (my_isspace(c)) { - if (!was_space) - *dst++ = '_'; - was_space = true; |