From 74733195244f645158a89c0aa74d6fc6ae525060 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 14 Mar 2018 19:58:32 +0100 Subject: gnu: ghc-7: Fix build with ncurses 6.1. * gnu/packages/haskell.scm (ghc-7)[arguments]: Make ncurses major+minor version detection more robust. --- gnu/packages/haskell.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') 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")) -- cgit 1.4.1