diff mbox series

[bug#61649] gnu: emacs-lsp-treemacs: Install vscode icons.

Message ID 10d28978f5f51d2906b2460973872e2550a4e8e2.1676893054.git.jlicht@fsfe.org
State New
Headers show
Series [bug#61649] gnu: emacs-lsp-treemacs: Install vscode icons. | expand

Commit Message

Jelle Licht Feb. 20, 2023, 11:38 a.m. UTC 
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(-)


base-commit: e8fcf1e42438113d7e4be82dc5a06de45eaceb76

Comments

Jelle Licht March 6, 2023, 2:13 p.m. UTC | #1 
Pushed to master.
- Jelle
diff mbox series

Patch

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