diff options
| author | Leo Famulari <leo@famulari.name> | 2017-03-07 22:38:35 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-07-12 18:25:11 -0400 |
| commit | 0a3aca47d9baed5f3cd25c6a6489a625776fd26e (patch) | |
| tree | 248c4dec68d223349bae10940a59f4fd391c3bf3 | |
| parent | 851ff8a5c587ff0d7e6f09a2a656503c2409d6c3 (diff) | |
| download | patches-0a3aca47d9baed5f3cd25c6a6489a625776fd26e.tar patches-0a3aca47d9baed5f3cd25c6a6489a625776fd26e.tar.gz | |
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.
| -rw-r--r-- | gnu/packages/bootloaders.scm | 5 | ||||
| -rw-r--r-- | gnu/packages/flex.scm | 13 |
2 files changed, 17 insertions, 1 deletions
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 2d8d89f754..76dad2923e 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -118,7 +118,10 @@ (native-inputs `(("unifont" ,unifont) ("bison" ,bison) - ("flex" ,flex) + ;; Due to a bug in flex >= 2.6.2, GRUB must be built with an older flex: + ;; <http://lists.gnu.org/archive/html/grub-devel/2017-02/msg00133.html> + ;; TODO Try building with flex > 2.6.4. + ("flex" ,flex-2.6.1) ("texinfo" ,texinfo) ("help2man" ,help2man) diff --git a/gnu/packages/flex.scm b/gnu/packages/flex.scm index fdda5f365d..b09ac0bb89 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 executes the corresponding C code.") (license (non-copyleft "file://COPYING" "See COPYING in the distribution.")))) + +(define-public flex-2.6.1 + (package + (inherit flex) + (version "2.6.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/westes/flex" + "/releases/download/v" version "/" + "flex-" version ".tar.xz")) + (sha256 + (base32 + "0gqhk4vkwy4gl9xbpgkljph8c0a5kpijz6wd0p5r9q202qn42yic")))))) |