summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-01-16 23:11:00 +0100
committerLudovic Courtès <ludo@gnu.org>2018-01-16 23:42:05 +0100
commitae785e5e55acb6cf4352c871b4840cc52aab0379 (patch)
treef284673ca3106482f2c20149f316c12d8cc06c67
parent07457c30ef858ceb395ee279cd35509165ba32c2 (diff)
downloadguix-ae785e5e55acb6cf4352c871b4840cc52aab0379.tar.gz
gnu: ghc@7: Link against the right libncursesw.so.
Fixes <https://bugs.gnu.org/30100>.
Regression introduced in 667082d59104d4b964dce878f5e8c0f8ad1be958.
Reported by Leo Famulari <leo@famulari.name>.

* gnu/packages/haskell.scm (ghc)[arguments] <configure-bin>: Adjust to
correctly determine the extension of "libncursesw.so.X.Y".
-rw-r--r--gnu/packages/haskell.scm9
1 files 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 <sinisa@bidin.eu>
 ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
 ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
-;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016, 2018 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016, 2017 ng0 <ng0@infotropique.org>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
@@ -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"))