From 04ac1a248c188e4e49e6372e8336c31d32d1c96e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 15 Feb 2022 11:09:52 +0200 Subject: [PATCH] gnu: ghc@4: Replace config.sub using config package. * gnu/packages/haskell.scm (ghc@4)[arguments]: Adjust custom 'bootstrap phase to adjust replacement of config.sub. [native-inputs]: Remove automake, add config. --- gnu/packages/haskell.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 6a1ca7c7e8..effc6eeb1b 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015, 2019 Eric Bavier ;;; Copyright © 2016, 2018, 2019, 2021 Ludovic Courtès ;;; Copyright © 2016, 2017 Nikita -;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016, 2022 Efraim Flashner ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2022 Ricardo Wurmus ;;; Copyright © 2016, 2017 David Craven ;;; Copyright © 2017 Danny Milosavljevic @@ -205,8 +205,8 @@ is itself quite fast.") (lambda* (#:key inputs #:allow-other-keys) (delete-file "configure") (delete-file "config.sub") - (install-file (string-append (assoc-ref inputs "automake") - "/share/automake-1.16/config.sub") + (install-file (search-input-file inputs + "/bin/config.sub") ".") ;; Avoid dependency on "happy" @@ -347,8 +347,8 @@ SplitObjs=NO (install-file "ghc/interpreter/nHandle.so" lib))))))) (native-inputs (list autoconf-2.13 - automake bison ;for parser.y + config ;; Needed to support lvalue casts. gcc-2.95