[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/44: haskell-build-system: register: Respect lib output.
From: |
guix-commits |
Subject: |
06/44: haskell-build-system: register: Respect lib output. |
Date: |
Thu, 13 Aug 2020 09:26:28 -0400 (EDT) |
rekado pushed a commit to branch wip-haskell
in repository guix.
commit 75bda3c648ae06a08c7512240698837ddf297182
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 46104cf..86681bb 100644
--- a/guix/build/haskell-build-system.scm
+++ b/guix/build/haskell-build-system.scm
@@ -246,7 +246,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"))
- 02/44: build-system/haskell: Support parallel builds., (continued)
- 02/44: build-system/haskell: Support parallel builds., guix-commits, 2020/08/13
- 05/44: build-system/haskell: Add default output "static"., guix-commits, 2020/08/13
- 01/44: gnu: Add ghc-8.8., guix-commits, 2020/08/13
- 08/44: build-system/haskell: Add 'extra-directories' keyword., guix-commits, 2020/08/13
- 10/44: gnu: Add "static" output to Haskell packages with custom outputs., guix-commits, 2020/08/13
- 11/44: gnu: ghc-8.6: Remove unnecessary references., guix-commits, 2020/08/13
- 15/44: gnu: ghc-blaze-html: Add "doc" output., guix-commits, 2020/08/13
- 16/44: gnu: ghc-aeson: Add "doc" output., guix-commits, 2020/08/13
- 04/44: build-system/haskell: Configure to link with shared libraries., guix-commits, 2020/08/13
- 03/44: build-system/haskell: Refactor configure step., guix-commits, 2020/08/13
- 06/44: haskell-build-system: register: Respect lib output.,
guix-commits <=
- 07/44: haskell-build-system: register: Remove references to the doc output., guix-commits, 2020/08/13
- 09/44: build-system/haskell: Do not pass "--bindir" during configure., guix-commits, 2020/08/13
- 12/44: gnu: ghc-hspec: Add "doc" output., guix-commits, 2020/08/13
- 13/44: gnu: ghc-crypto-api-tests: Add "doc" output., guix-commits, 2020/08/13
- 14/44: gnu: ghc-cryptonite: Add "doc" output., guix-commits, 2020/08/13
- 19/44: gnu: ghc-basement: Add "doc" output., guix-commits, 2020/08/13
- 21/44: gnu: ghc-cmdargs: Add "doc" output., guix-commits, 2020/08/13
- 26/44: gnu: ghc-generic-deriving: Add "doc" output., guix-commits, 2020/08/13
- 27/44: gnu: ghc-generics-sop: Add "doc" output., guix-commits, 2020/08/13
- 28/44: gnu: ghc-haskell-src-exts: Add "doc" output., guix-commits, 2020/08/13