aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2018-03-14 19:58:32 +0100
committerRicardo Wurmus <rekado@elephly.net>2018-03-14 19:59:31 +0100
commit74733195244f645158a89c0aa74d6fc6ae525060 (patch)
tree58cba9c6b4aa313e72b0ce7474f99635d69aaea9
parent7c4a0f975b587d0c2718b80ba5c2fa7b8cc8f2ec (diff)
downloadpatches-74733195244f645158a89c0aa74d6fc6ae525060.tar
patches-74733195244f645158a89c0aa74d6fc6ae525060.tar.gz
gnu: ghc-7: Fix build with ncurses 6.1.
* gnu/packages/haskell.scm (ghc-7)[arguments]: Make ncurses major+minor version detection more robust.
-rw-r--r--gnu/packages/haskell.scm6
1 files changed, 4 insertions, 2 deletions
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index c5408f8627..4b1e3f23b8 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -282,9 +282,11 @@ top of CLISP.")
(mkdir-p libtinfo-dir)
(symlink
(string-append ncurses-lib "/libncursesw.so."
- ;; Extract "6.0" from "6.0-20170930".
+ ;; Extract "6.0" from "6.0-20170930" if a
+ ;; dash-separated version tag exists.
,(let* ((v (package-version ncurses))
- (d (string-index v #\-)))
+ (d (or (string-index v #\-)
+ (string-length v))))
(version-major+minor (string-take v d))))
(string-append libtinfo-dir "/libtinfo.so.5"))