[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/44: haskell-build-system: register: Respect lib output.
From: |
guix-commits |
Subject: |
04/44: haskell-build-system: register: Respect lib output. |
Date: |
Fri, 17 Jul 2020 08:33:30 -0400 (EDT) |
rekado pushed a commit to branch wip-haskell-updates
in repository guix.
commit 203a0e07646e54d422aef39abe97b2e7e905fcda
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Tue Jun 16 22:32:09 2020 +0200
haskell-build-system: register: Respect lib output.
* guix/build/haskell-build-system.scm (register): Use lib output if it
exists.
---
guix/build/haskell-build-system.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/guix/build/haskell-build-system.scm
b/guix/build/haskell-build-system.scm
index e7c001e..ea20874 100644
--- a/guix/build/haskell-build-system.scm
+++ b/guix/build/haskell-build-system.scm
@@ -243,7 +243,7 @@ given Haskell package."
(let* ((out (assoc-ref outputs "out"))
(haskell (assoc-ref inputs "haskell"))
(name-verion (strip-store-file-name haskell))
- (lib (string-append out "/lib"))
+ (lib (string-append (or (assoc-ref outputs "lib") out) "/lib"))
(config-dir (string-append lib
"/" name-verion
"/" name ".conf.d"))
- branch wip-haskell-updates created (now a989d4f), guix-commits, 2020/07/17
- 01/44: gnu: Add ghc-8.8., guix-commits, 2020/07/17
- 02/44: build-system/haskell: Support parallel builds., guix-commits, 2020/07/17
- 03/44: build-system/haskell: Add default output "static"., guix-commits, 2020/07/17
- 04/44: haskell-build-system: register: Respect lib output.,
guix-commits <=
- 06/44: build-system/haskell: Simplify configure step., guix-commits, 2020/07/17
- 08/44: gnu: Add "static" output to Haskell packages with custom outputs., guix-commits, 2020/07/17
- 13/44: gnu: ghc-crypto-api-tests: Add "doc" output., guix-commits, 2020/07/17
- 12/44: gnu: ghc-hspec: Add "doc" output., guix-commits, 2020/07/17
- 14/44: gnu: ghc-cryptonite: Add "doc" output., guix-commits, 2020/07/17
- 16/44: gnu: ghc-aeson: Add "doc" output., guix-commits, 2020/07/17
- 07/44: build-system/haskell: Configure to link with shared libraries., guix-commits, 2020/07/17
- 05/44: haskell-build-system: register: Remove references to the doc output., guix-commits, 2020/07/17
- 09/44: gnu: ghc-libyaml: Add libyaml via --extra-lib-dirs., guix-commits, 2020/07/17
- 21/44: gnu: ghc-cmdargs: Add "doc" output., guix-commits, 2020/07/17