summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Bavier <bavier@member.fsf.org>2015-06-06 07:28:57 -0500
committerEric Bavier <bavier@member.fsf.org>2015-06-11 18:55:49 -0500
commit6508ce55e95b0472b2212befcb56919eb44fb41c (patch)
tree2942c4c861201165158f2c5f14d6ddbcab355478
parentb4b1fe9d2f7321a95fa16d18a5f0088908122361 (diff)
downloadpatches-6508ce55e95b0472b2212befcb56919eb44fb41c.tar
patches-6508ce55e95b0472b2212befcb56919eb44fb41c.tar.gz
build-system/haskell: install config for any package that creates it.
A Cabal package is allowed to declare an "empty" library, in an otherwise executable-only package, for the purpose of allowing Cabal to use it as a dependency for other packages. See e.g. hspec-discover. * guix/build/haskell-build-system.scm (register): Unconditionally call setup script with "register", and install any config file generated.
-rw-r--r--guix/build/haskell-build-system.scm8
1 files changed, 4 insertions, 4 deletions
diff --git a/guix/build/haskell-build-system.scm b/guix/build/haskell-build-system.scm
index d382ee403d..c0cb789581 100644
--- a/guix/build/haskell-build-system.scm
+++ b/guix/build/haskell-build-system.scm
@@ -166,13 +166,13 @@ generate the cache as it would clash in user profiles."
(package-name-version haskell)
"/package.conf.d"))
(id-rx (make-regexp "^id: *(.*)$"))
- (lib-rx (make-regexp "lib.*\\.(a|so)"))
- (config-file (string-append config-dir "/" name ".conf"))
+ (config-file (string-append out "/" name ".conf"))
(params
(list (string-append "--gen-pkg-config=" config-file))))
- (unless (null? (find-files lib lib-rx))
+ (run-setuphs "register" params)
+ ;; The conf file is created only when there is a library to register.
+ (when (file-exists? config-file)
(mkdir-p config-dir)
- (run-setuphs "register" params)
(let ((config-file-name+id
(call-with-ascii-input-file config-file (cut grep id-rx <>))))
(rename-file config-file