From 718dc7d4a5e5d26cac80c79d78535677e0379dc8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Jun 2020 22:28:54 +0200 Subject: 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. --- guix/build-system/haskell.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'guix/build-system') 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) -- cgit v1.2.3