diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2020-06-16 22:28:54 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2020-08-12 14:45:48 +0200 |
| commit | 718dc7d4a5e5d26cac80c79d78535677e0379dc8 (patch) | |
| tree | 63ff1d56cef587e2a05095578449335666fe16f7 /guix/build/haskell-build-system.scm | |
| parent | 9e5496e0ae0ee8f638ca93949ecca314fdb9251e (diff) | |
| download | guix-patches-718dc7d4a5e5d26cac80c79d78535677e0379dc8.tar guix-patches-718dc7d4a5e5d26cac80c79d78535677e0379dc8.tar.gz | |
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/haskell-build-system.scm')
| -rw-r--r-- | guix/build/haskell-build-system.scm | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/guix/build/haskell-build-system.scm b/guix/build/haskell-build-system.scm index f57981511a..46104cfb19 100644 --- a/guix/build/haskell-build-system.scm +++ b/guix/build/haskell-build-system.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> -;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2018, 2020 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com> ;;; ;;; This file is part of GNU Guix. @@ -131,9 +131,20 @@ and parameters ~s~%" `(,(string-append "--ghc-option=-j" (number->string (parallel-job-count)))) '()))) -(define* (install #:rest empty) +(define* (install #:key outputs #:allow-other-keys) "Install a given Haskell package." - (run-setuphs "copy" '())) + (run-setuphs "copy" '()) + (when (assoc-ref outputs "static") + (let ((static (assoc-ref outputs "static")) + (lib (or (assoc-ref outputs "lib") + (assoc-ref outputs "out")))) + (for-each (lambda (static-lib) + (let* ((subdir (string-drop static-lib (string-length lib))) + (new (string-append static subdir))) + (mkdir-p (dirname new)) + (rename-file static-lib new))) + (find-files lib "\\.a$")))) + #t) (define (grep rx port) "Given a regular-expression RX including a group, read from PORT until the |