aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArun Isaac2021-11-25 11:17:41 +0530
committerArun Isaac2021-11-25 11:17:41 +0530
commited593619f02627de736fba75987b561637e42cfc (patch)
tree061de32afcba46f871b9da152d6b1e7cd00cb5d9
parentf051ec7626677204213dfe43e2d795a65f275945 (diff)
downloadccwl-ed593619f02627de736fba75987b561637e42cfc.tar.gz
ccwl-ed593619f02627de736fba75987b561637e42cfc.tar.lz
ccwl-ed593619f02627de736fba75987b561637e42cfc.zip
guix.scm: Use the upstream Guix guile-libyaml package.
* guix.scm: Do not prefix import of (gnu packages guile-xyz) with guix: (guile-libyaml): Delete variable.
-rw-r--r--guix.scm23
1 files changed, 1 insertions, 22 deletions
diff --git a/guix.scm b/guix.scm
index 31eec71..9d1a0ad 100644
--- a/guix.scm
+++ b/guix.scm
@@ -31,7 +31,7 @@
(gnu packages bioinformatics)
(gnu packages graphviz)
(gnu packages guile)
- ((gnu packages guile-xyz) #:prefix guix:)
+ (gnu packages guile-xyz)
(gnu packages pkg-config)
(gnu packages skribilo)
(gnu packages texinfo)
@@ -44,27 +44,6 @@
(define %source-dir (dirname (current-filename)))
-;; The upstream Guix guile-libyaml package is broken. Fix it
-;; temporarily here.
-(define guile-libyaml
- (package
- (inherit guix:guile-libyaml)
- (arguments
- (substitute-keyword-arguments (package-arguments guix:guile-libyaml)
- ((#:phases phases)
- `(modify-phases ,phases
- (replace 'remove-unused-files
- (lambda _
- (for-each delete-file
- (list "guix.scm" "demo1.scm" "demo1.yml"))))
- (replace 'build-ffi
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "yaml/libyaml.scm"
- (("dynamic-link \"libyaml\"")
- (string-append "dynamic-link \""
- (assoc-ref inputs "libyaml")
- "/lib/libyaml\"")))))))))))
-
(define ccwl
(package
(name "ccwl")