03/03: gnu: address@hidden: Link against the right libncursesw.so.

[Ludovic Courtès]

civodul pushed a commit to branch core-updates
in repository guix.

commit ae785e5e55acb6cf4352c871b4840cc52aab0379
Author: Ludovic Courtès <address@hidden>
Date:   Tue Jan 16 23:11:00 2018 +0100

    gnu: address@hidden: Link against the right libncursesw.so.
    
    Fixes <https://bugs.gnu.org/30100>.
    Regression introduced in 667082d59104d4b964dce878f5e8c0f8ad1be958.
    Reported by Leo Famulari <address@hidden>.
    
    * gnu/packages/haskell.scm (ghc)[arguments] <configure-bin>: 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 7fb8213..db3e400 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2015 Siniša Biđin <address@hidden>
 ;;; Copyright © 2015 Paul van der Walt <address@hidden>
 ;;; Copyright © 2015 Eric Bavier <address@hidden>
-;;; Copyright © 2016 Ludovic Courtès <address@hidden>
+;;; Copyright © 2016, 2018 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2016, 2017 ng0 <address@hidden>
 ;;; Copyright © 2016 Efraim Flashner <address@hidden>
 ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <address@hidden>
@@ -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"))