From ae785e5e55acb6cf4352c871b4840cc52aab0379 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 16 Jan 2018 23:11:00 +0100 Subject: [PATCH] gnu: ghc@7: Link against the right libncursesw.so. Fixes . Regression introduced in 667082d59104d4b964dce878f5e8c0f8ad1be958. Reported by Leo Famulari . * gnu/packages/haskell.scm (ghc)[arguments] : Adjust to correctly determine the extension of "libncursesw.so.X.Y". --- gnu/packages/haskell.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 7fb8213048..db3e400624 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Siniša Biđin ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2015 Eric Bavier -;;; Copyright © 2016 Ludovic Courtès +;;; Copyright © 2016, 2018 Ludovic Courtès ;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus @@ -280,9 +280,12 @@ top of CLISP.") (mkdir-p libtinfo-dir) (symlink (string-append ncurses-lib "/libncursesw.so." - ,(version-major+minor - (package-version ncurses))) + ;; Extract "6.0" from "6.0-20170930". + ,(let* ((v (package-version ncurses)) + (d (string-index v #\-))) + (version-major+minor (string-take v d)))) (string-append libtinfo-dir "/libtinfo.so.5")) + (setenv "PATH" (string-append (getenv "PATH") ":" ghc-bootstrap-prefix "/bin"))