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.

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")