This is an automated email from the git hooks/post-receive script.
guix_mirror_bot pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new db5c934234 gnu: ghc-9.8: Fix building for i686-linux.
db5c934234 is described below
commit db5c934234a62e072d8ca0e1688c56f5d727b9cf
Author: Efraim Flashner <[email protected]>
AuthorDate: Thu Jun 18 10:53:39 2026 +0300
gnu: ghc-9.8: Fix building for i686-linux.
* gnu/packages/haskell.scm (ghc-9.8)[arguments]: Adjust the
'fix-iserv-rpath phase to link the correct directory.
Signed-off-by: Andreas Enge <[email protected]>
---
gnu/packages/haskell.scm | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 04a8e748e6..6bba8bccbb 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -1928,8 +1928,11 @@ SRC_HC_OPTS += -optc-mno-outline-atomics
(string-append
"*.iserv.ghc.link.opts += -optl-Wl,-rpath,"
#$output "/lib/ghc-" #$(package-version this-package)
- "/lib/" #$(or (%current-target-system)
- (%current-system))
+ "/lib/" #$(match (gnu-triplet->nix-system
+ (or (%current-target-system)
+ (%current-system)))
+ ("i686-linux" "i386-linux")
+ (x x))
"-ghc-" #$(package-version this-package) "/")
port)))))
;; This phase patches the 'ghc-pkg' command so that it sorts the
list