Require geiser and guile

1 files changed, 44 insertions, 30 deletions

diff --git a/vkraus/packages/blog.scm b/vkraus/packages/blog.scm
index 9d2c067..b475e7d 100644
--- a/vkraus/packages/blog.scm
+++ b/vkraus/packages/blog.scm
@@ -12,6 +12,8 @@
   #:use-module (gnu packages perl)
   #:use-module (gnu packages lisp)
   #:use-module (gnu packages version-control)
+  #:use-module (gnu packages guile)
+  #:use-module (gnu packages guile-xyz)
   #:use-module (guix gexp)
   #:use-module (guix git)
   #:use-module (guix modules)
@@ -145,39 +147,51 @@ recent snapshot of gnulib.")))
      (sha256 (base32 blog-source-hash))))
    (build-system gnu-build-system)
    (arguments
-    '(#:modules ((guix build utils)
+    (list
+     #:modules '((guix build utils)
                  (guix build gnu-build-system))
-      #:phases
-      (modify-phases %standard-phases
-        (delete 'configure)
-        (delete 'build)
-        (delete 'check)
-        (replace 'install
-          (lambda* (#:key outputs inputs #:allow-other-keys)
-            (let ((out (assoc-ref outputs "out"))
-                  (bash-in (search-input-file inputs "/bin/bash"))
-                  (emacs-in (search-input-file inputs "/bin/emacs"))
-                  (gem-path
-                   (search-path-as-list '("/lib/ruby/vendor_ruby")
-                                        (map cdr inputs))))
-              (mkdir out)
-              (setenv "GEM_PATH" (string-join gem-path ":"))
-              (setenv "PREFIX" out)
-              (setenv "HOME" ".home")
-              (mkdir ".build")
-              (with-directory-excursion
-                  ".build"
-                (invoke emacs-in "--batch"
-                        "--file" "../init.org"
-                        "--eval" "(require 'org)"
-                        "-l" (search-input-file inputs "/share/emacs/site-lisp/htmlize-1.56/htmlize.el")
-                        "--eval" "(setq org-confirm-babel-evaluate nil)"
-                        "--eval" "(setq org-html-htmlize-output-type 'css)"
-                        "-f" "org-babel-tangle")
-                (invoke bash-in "../build"))))))))
+     #:phases
+     #~(modify-phases %standard-phases
+         (delete 'configure)
+         (delete 'build)
+         (delete 'check)
+         (replace 'install
+           (lambda* (#:key outputs inputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out"))
+                   (bash-in (search-input-file inputs "/bin/bash"))
+                   (emacs-in (search-input-file inputs "/bin/emacs"))
+                   (gem-path
+                    (search-path-as-list '("/lib/ruby/vendor_ruby")
+                                         (map cdr inputs))))
+               (mkdir out)
+               (setenv "GEM_PATH" (string-join gem-path ":"))
+               (setenv "PREFIX" out)
+               (setenv "HOME" ".home")
+               (mkdir ".build")
+               (with-directory-excursion
+                   ".build"
+                 (invoke emacs-in "--batch"
+                         "--file" "../init.org"
+                         "--eval" "(require 'org)"
+                         "-l" (search-input-file
+                               inputs
+                               #$(format #f "/share/emacs/site-lisp/htmlize-~a/htmlize.el"
+                                         (package-version emacs-htmlize)))
+                         "-L" (search-input-directory
+                               inputs
+                               #$(format #f "/share/emacs/site-lisp/geiser-~a"
+                                         (package-version emacs-geiser)))
+                         "-L" (search-input-directory
+                               inputs
+                               #$(format #f "/share/emacs/site-lisp/geiser-guile-~a"
+                                         (package-version emacs-geiser-guile)))
+                         "--eval" "(setq org-confirm-babel-evaluate nil)"
+                         "--eval" "(setq org-html-htmlize-output-type 'css)"
+                         "-f" "org-babel-tangle")
+                 (invoke bash-in "../build"))))))))
    (native-inputs
     (list emacs bash jekyll emacs-org emacs-htmlize ruby-minima
-          guile-gnutls-with-hashes))
+          guile-3.0 emacs-geiser emacs-geiser-guile guile-gnutls-with-hashes))
    (synopsis "La vie trépidante d’un chat au foyer — blog personnel")
    (description "Ceci est mon blog personnel.")
    (home-page "https://vivien.planete-kraus.eu")