summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2017-03-07 22:38:35 -0500
committerLeo Famulari <leo@famulari.name>2017-07-12 18:25:11 -0400
commit0a3aca47d9baed5f3cd25c6a6489a625776fd26e (patch)
tree248c4dec68d223349bae10940a59f4fd391c3bf3 /gnu
parent851ff8a5c587ff0d7e6f09a2a656503c2409d6c3 (diff)
gnu: grub: Fix build failure with recent flex.
* gnu/packages/flex.scm (flex-2.6.1): New variable. * gnu/packages/bootloaders.scm (grub)[native-inputs]: Use flex-2.6.1.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/bootloaders.scm5
-rw-r--r--gnu/packages/flex.scm13
2 files changed, 17 insertions, 1 deletions
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 2d8d89f754a..76dad2923e4 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -118,7 +118,10 @@
118 (native-inputs 118 (native-inputs
119 `(("unifont" ,unifont) 119 `(("unifont" ,unifont)
120 ("bison" ,bison) 120 ("bison" ,bison)
121 ("flex" ,flex) 121 ;; Due to a bug in flex >= 2.6.2, GRUB must be built with an older flex:
122 ;; <http://lists.gnu.org/archive/html/grub-devel/2017-02/msg00133.html>
123 ;; TODO Try building with flex > 2.6.4.
124 ("flex" ,flex-2.6.1)
122 ("texinfo" ,texinfo) 125 ("texinfo" ,texinfo)
123 ("help2man" ,help2man) 126 ("help2man" ,help2man)
124 127
diff --git a/gnu/packages/flex.scm b/gnu/packages/flex.scm
index fdda5f365dc..b09ac0bb896 100644
--- a/gnu/packages/flex.scm
+++ b/gnu/packages/flex.scm
@@ -85,3 +85,16 @@ regular expressions for each rule. Whenever it finds a match, it
85executes the corresponding C code.") 85executes the corresponding C code.")
86 (license (non-copyleft "file://COPYING" 86 (license (non-copyleft "file://COPYING"
87 "See COPYING in the distribution.")))) 87 "See COPYING in the distribution."))))
88
89(define-public flex-2.6.1
90 (package
91 (inherit flex)
92 (version "2.6.1")
93 (source (origin
94 (method url-fetch)
95 (uri (string-append "https://github.com/westes/flex"
96 "/releases/download/v" version "/"
97 "flex-" version ".tar.xz"))
98 (sha256
99 (base32
100 "0gqhk4vkwy4gl9xbpgkljph8c0a5kpijz6wd0p5r9q202qn42yic"))))))