summaryrefslogtreecommitdiff
path: root/guix/build-system
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2020-06-16 22:28:54 +0200
committerRicardo Wurmus <rekado@elephly.net>2020-08-12 14:45:48 +0200
commit718dc7d4a5e5d26cac80c79d78535677e0379dc8 (patch)
tree63ff1d56cef587e2a05095578449335666fe16f7 /guix/build-system
parent9e5496e0ae0ee8f638ca93949ecca314fdb9251e (diff)
build-system/haskell: Add default output "static".
* guix/build-system/haskell.scm (lower): Add OUTPUTS keyword and add the "static" output in the common case. (haskell-build): Set the default value for the OUTPUTS keyword to include the "static" output. * guix/build/haskell-build-system.scm (install): Move static libraries to the "static" output if it exists.
Diffstat (limited to 'guix/build-system')
-rw-r--r--guix/build-system/haskell.scm9
1 files changed, 6 insertions, 3 deletions
diff --git a/guix/build-system/haskell.scm b/guix/build-system/haskell.scm
index ab93c9601c..f92fbcd713 100644
--- a/guix/build-system/haskell.scm
+++ b/guix/build-system/haskell.scm
@@ -67,7 +67,7 @@ version REVISION."
#:rest arguments)
"Return a bag for NAME."
(define private-keywords
- '(#:target #:haskell #:cabal-revision #:inputs #:native-inputs))
+ '(#:target #:haskell #:cabal-revision #:inputs #:native-inputs #:outputs))
(define (cabal-revision->origin cabal-revision)
(match cabal-revision
@@ -95,7 +95,10 @@ version REVISION."
,@(standard-packages)))
(build-inputs `(("haskell" ,haskell)
,@native-inputs))
- (outputs outputs)
+ ;; XXX: this is a hack to get around issue #41569.
+ (outputs (match outputs
+ (("out") (cons "static" outputs))
+ (_ outputs)))
(build haskell-build)
(arguments (strip-keyword-arguments private-keywords arguments)))))
@@ -109,7 +112,7 @@ version REVISION."
(configure-flags ''())
(phases '(@ (guix build haskell-build-system)
%standard-phases))
- (outputs '("out"))
+ (outputs '("out" "static"))
(search-paths '())
(system (%current-system))
(guile #f)