all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#61649] [PATCH] gnu: emacs-lsp-treemacs: Install vscode icons.
@ 2023-02-20 11:38 jlicht
  2023-03-06 14:13 ` bug#61649: " Jelle Licht
  0 siblings, 1 reply; 2+ messages in thread
From: jlicht @ 2023-02-20 11:38 UTC (permalink / raw)
  To: 61649; +Cc: Jelle Licht

From: Jelle Licht <jlicht@fsfe.org>

emacs-lsp-treemacs bundles icons with from both the vscode-icons/vscode-icons
and microsoft/vscode-icons projects.

* gnu/packages/emacs-xyz.scm (emacs-lsp-treemacs)[arguments]<#:include>:
Install vscode icons.
[license]: Update accordingly.
---
 gnu/packages/emacs-xyz.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 97e7a1b844..a28041bbae 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -27971,6 +27971,8 @@ (define-public emacs-lsp-treemacs
                           "--hard-dereference"
                           dir))))))))
     (build-system emacs-build-system)
+    (arguments
+     (list #:include #~(cons "^icons\\/" %default-include)))
     (propagated-inputs
      (list emacs-lsp-mode emacs-treemacs))
     (home-page "https://github.com/emacs-lsp/lsp-treemacs")
@@ -27978,7 +27980,9 @@ (define-public emacs-lsp-treemacs
     (description
      "This package provides integration between LSP mode and treemacs,
 and implementation of treeview controls using treemacs as a tree renderer.")
-    (license license:gpl3+)))
+    (license (list license:gpl3+
+                   license:cc-by4.0  ; microsoft/vscode-icons
+                   license:expat)))) ; vscode-icons/vscode-icons
 
 (define-public emacs-dap-mode
   (package

base-commit: e8fcf1e42438113d7e4be82dc5a06de45eaceb76
-- 
2.39.1





^ permalink raw reply related	[flat|nested] 2+ messages in thread

* bug#61649: [PATCH] gnu: emacs-lsp-treemacs: Install vscode icons.
  2023-02-20 11:38 [bug#61649] [PATCH] gnu: emacs-lsp-treemacs: Install vscode icons jlicht
@ 2023-03-06 14:13 ` Jelle Licht
  0 siblings, 0 replies; 2+ messages in thread
From: Jelle Licht @ 2023-03-06 14:13 UTC (permalink / raw)
  To: 61649-done


Pushed to master.
- Jelle




^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2023-03-06 14:14 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-20 11:38 [bug#61649] [PATCH] gnu: emacs-lsp-treemacs: Install vscode icons jlicht
2023-03-06 14:13 ` bug#61649: " Jelle Licht

Code repositories for project(s) associated with this external index

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

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.