nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: ghc@7: Link against the right libncursesw.so. 

Fixes <https://bugs.gnu.org/30100>.
Regression introduced in 667082d591.
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".
This commit is contained in:
Ludovic Courtès 2018-01-16 23:11:00 +01:00
parent 07457c30ef
commit ae785e5e55
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gnu/packages/haskell.scm
View File

@ -3,7 +3,7 @@
;;; Copyright © 2015 Siniša Biđin <sinisa@bidin.eu> ;;; Copyright © 2015 Siniša Biđin <sinisa@bidin.eu>
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.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, 2017 ng0 <ng0@infotropique.org>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
@ -280,9 +280,12 @@ top of CLISP.")
(mkdir-p libtinfo-dir) (mkdir-p libtinfo-dir)
(symlink (symlink
(string-append ncurses-lib "/libncursesw.so." (string-append ncurses-lib "/libncursesw.so."
,(version-major+minor ;; Extract "6.0" from "6.0-20170930".
(package-version ncurses))) ,(let* ((v (package-version ncurses))
(d (string-index v #\-)))
(version-major+minor (string-take v d))))
(string-append libtinfo-dir "/libtinfo.so.5")) (string-append libtinfo-dir "/libtinfo.so.5"))
(setenv "PATH" (setenv "PATH"
(string-append (getenv "PATH") ":" (string-append (getenv "PATH") ":"
ghc-bootstrap-prefix "/bin")) ghc-bootstrap-prefix "/bin"))