[bug#46960] [PATCH]: Fix monad (and emacsy-minimal) build

[bug#46960] [PATCH]: Fix monad (and emacsy-minimal) build

[Maxime Devos]

[-- Attachment #1.1: Type: text/plain, Size: 104 bytes --]

This fixes bug#46934 (https://issues.guix.gnu.org/46934).
emacsy-minimal is only used by nomad AFAIK.

[-- Attachment #1.2: 0001-gnu-nomad-Fix-build.patch --]
[-- Type: text/x-patch, Size: 1557 bytes --]

From c4057074960a525389f781cc30d8c2b82c2e48e5 Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos@telenet.be>
Date: Fri, 5 Mar 2021 20:03:19 +0100
Subject: [PATCH] gnu: nomad: Fix build.

Fixes: <https://issues.guix.gnu.org/41672>.
Fixes: <https://issues.guix.gnu.org/46934>.

* gnu/packages/guile-xyz.scm
  (emacsy-minimal)[native-inputs]: Add autotools inputs and
  use guile-2.2 instead of guile-3.0.
  (nomad)[inputs]: Use the guile2.2 version of gnutls.
---
 gnu/packages/guile-xyz.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 45b3a82d00..9c237da8f7 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -3254,6 +3254,11 @@ in C using Gtk+-3 and WebKitGtk.")
          (sha256
           (base32 "03ym14g9qhjqmryr5z065kynqm8yhmvnbs2djl6vp3i9cmqln8cl"))))
       (build-system gnu-build-system)
+      (native-inputs
+       `(("autoconf" ,autoconf)
+         ("automake" ,automake)
+         ("guile" ,guile-2.2)
+         ,@(alist-delete "guile" (package-native-inputs emacsy))))
       (inputs
        `(("guile" ,guile-2.2)
          ("guile-lib" ,guile2.2-lib)
@@ -3333,7 +3338,7 @@ perform geometrical transforms on JPEG images.")
        ("guile-lib" ,guile2.2-lib)
        ("guile-readline" ,guile2.2-readline)
        ("guile-gcrypt" ,guile2.2-gcrypt)
-       ("gnutls" ,gnutls)
+       ("guile-gnutls" ,guile2.2-gnutls)
        ("g-golf" ,g-golf)
        ("shroud" ,shroud)
        ("emacsy" ,emacsy-minimal)
-- 
2.30.1


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

bug#46960: [PATCH]: Fix monad (and emacsy-minimal) build

[Ludovic Courtès]

Hi,

Maxime Devos <maximedevos@telenet.be> skribis:

> This fixes bug#46934 (https://issues.guix.gnu.org/46934).
> emacsy-minimal is only used by nomad AFAIK.

Apparently this was fixed independently in commit
bb8a0d8057be204ff507ef01a082335a1620f075.

> From c4057074960a525389f781cc30d8c2b82c2e48e5 Mon Sep 17 00:00:00 2001
> From: Maxime Devos <maximedevos@telenet.be>
> Date: Fri, 5 Mar 2021 20:03:19 +0100
> Subject: [PATCH] gnu: nomad: Fix build.
>
> Fixes: <https://issues.guix.gnu.org/41672>.

Ah ha!  It would be best to move Emacsy to Guile 3.0, looks like little
is missing…

Thanks,
Ludo’.