unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Ivan Vilata i Balaguer <ivan@selidor.net>
To: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Cc: 61040@debbugs.gnu.org, Ivan Vilata i Balaguer <ivan@selidor.net>
Subject: [bug#61040] [PATCH] gnu: emacs-ergoemacs-mode: Include keyboard layout SVGs.
Date: Wed, 25 Jan 2023 10:33:46 +0100	[thread overview]
Message-ID: <Y9D3eu7X5Hqn7DQt@sax> (raw)
In-Reply-To: <87mt67oj1z.fsf@nicolasgoaziou.fr>


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

Nicolas Goaziou (2023-01-24 19:59:20 +0100) wrote:

> Ivan Vilata i Balaguer <ivan@selidor.net> writes:
> 
> > +    (arguments
> > +     (list #:phases #~(modify-phases %standard-phases
> > +                        (add-after 'install 'install-kbd-svgs
> > +                          (lambda _
> > +                            (let ((dir (elpa-directory #$output)))
> > +                              (install-file "kbd.svg" dir)
> > +                              (install-file "kbd-ergo.svg" dir)))))))
> 
> Please use #:include keyword for these files instead of this
> hand-crafted phase.

Thanks Nicolas, I didn't know about the keyword.  Attaching the updated patch.
Much simpler! 🙂

Salut !

-- 
Ivan Vilata i Balaguer -- https://elvil.net/

[-- Attachment #1.2: 0001-gnu-emacs-ergoemacs-mode-Include-keyboard-layout-SVG.patch --]
[-- Type: text/plain, Size: 1570 bytes --]

From 7c21f589e4871ffedcc0d6d2aef4e64bfa08ce58 Mon Sep 17 00:00:00 2001
From: Ivan Vilata-i-Balaguer <ivan@selidor.net>
Date: Wed, 25 Jan 2023 10:29:56 +0100
Subject: [PATCH] gnu: emacs-ergoemacs-mode: Include keyboard layout SVGs.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A couple of SVG files from the source need to be installed to make
‘ergoemacs-theme-describe’ and ‘ergoemacs-layout-describe’ work.

* gnu/packages/emacs-xyz.scm (emacs-ergoemacs-mode)[arguments]: New field.
---
 gnu/packages/emacs-xyz.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index ee115192f9..77ab0bc448 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -120,6 +120,7 @@
 ;;; Copyright © 2022 Thiago Jung Bauermann <bauermann@kolabnow.com>
 ;;; Copyright © 2022 Joeke de Graaf <joeke@posteo.net>
 ;;; Copyright © 2023 Simon Streit <simon@netpanic.org>
+;;; Copyright © 2023 Ivan Vilata-i-Balaguer <ivan@selidor.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -19974,6 +19975,9 @@ (define-public emacs-ergoemacs-mode
         (base32
          "1ipwzl0l26g5qvc1sgmz2ra5vn1j3hl0mnkgzpa3j4p8gsmxdiqr"))))
     (build-system emacs-build-system)
+    (arguments
+     (list #:include #~(cons* "^kbd\\.svg$" "^kbd-ergo\\.svg$"
+                              %default-include)))
     (propagated-inputs
      (list emacs-undo-tree))
     (home-page "https://ergoemacs.github.io/")
-- 
2.38.1


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

  reply	other threads:[~2023-01-25  9:34 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-24 18:16 [bug#61040] [PATCH] gnu: emacs-ergoemacs-mode: Include keyboard layout SVGs Ivan Vilata i Balaguer
2023-01-24 18:59 ` Nicolas Goaziou
2023-01-25  9:33   ` Ivan Vilata i Balaguer [this message]
2023-01-27  8:34     ` bug#61040: " Nicolas Goaziou

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=Y9D3eu7X5Hqn7DQt@sax \
    --to=ivan@selidor.net \
    --cc=61040@debbugs.gnu.org \
    --cc=mail@nicolasgoaziou.fr \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).