diff options
Diffstat (limited to 'gnu/packages/haskell.scm')
| -rw-r--r-- | gnu/packages/haskell.scm | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index e8bbc9dd10..69a806e635 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Siniša Biđin <[email protected]> ;;; Copyright © 2015 Paul van der Walt <[email protected]> ;;; Copyright © 2015, 2019 Eric Bavier <[email protected]> -;;; Copyright © 2016, 2018, 2019 Ludovic Courtès <[email protected]> +;;; Copyright © 2016, 2018, 2019, 2021 Ludovic Courtès <[email protected]> ;;; Copyright © 2016, 2017 Nikita <[email protected]> ;;; Copyright © 2016 Efraim Flashner <[email protected]> ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <[email protected]> @@ -248,9 +248,8 @@ top of CLISP.") (gmp-lib (string-append gmp "/lib")) (gmp-include (string-append gmp "/include")) (ncurses-lib - (string-append (assoc-ref inputs "ncurses") "/lib")) - (ld-so (string-append (assoc-ref inputs "libc") - ,(glibc-dynamic-linker))) + (dirname (search-input-file inputs "/lib/libncurses.so"))) + (ld-so (search-input-file inputs ,(glibc-dynamic-linker))) (libtinfo-dir (string-append ghc-bootstrap-prefix "/lib/ghc-7.8.4/terminfo-0.4.0.0"))) @@ -635,7 +634,7 @@ interactive environment for the functional language Haskell.") (sha256 (base32 "0c55pj2820q26rikhpf636sn4mjgqsxjrl94vsywrh79dxp3k14z")))) - ("git" ,git) ; invoked during tests + ("git" ,git-minimal/fixed) ; invoked during tests ,@(filter (match-lambda (("ghc-bootstrap" . _) #f) (("ghc-testsuite" . _) #f) @@ -688,7 +687,7 @@ interactive environment for the functional language Haskell.") (sha256 (base32 "1zl25gg6bpx5601k8h3cqnns1xfc0nqgwnh8jvn2s65ra3f2g1nz")))) - ("git" ,git-minimal) ; invoked during tests + ("git" ,git-minimal/fixed) ; invoked during tests ,@(filter (match-lambda (("ghc-bootstrap" . _) #f) (("ghc-testsuite" . _) #f) |