diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-27 15:59:30 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-27 15:59:30 -0400 |
| commit | 990a4822f1cb45c1470fe38cbf17fd7bb54d0088 (patch) | |
| tree | 1c1ff41c9264fe5af5ee0b8723d1e367e958c051 /gnu/packages/emacs.scm | |
| parent | 91db77c955cc7ef95dd8b535e40d6b4cf28669ec (diff) | |
| parent | 3c6e220d8100281074c414a43c1efe9a01b53771 (diff) | |
| download | guix-990a4822f1cb45c1470fe38cbf17fd7bb54d0088.tar guix-990a4822f1cb45c1470fe38cbf17fd7bb54d0088.tar.gz | |
Merge branch 'staging' into core-updates
Conflicts resolved in:
gnu/local.mk
gnu/packages/cran.scm
gnu/packages/gnome.scm
gnu/packages/gtk.scm
gnu/packages/icu4c.scm
gnu/packages/java.scm
gnu/packages/machine-learning.scm
gnu/packages/tex.scm
Diffstat (limited to 'gnu/packages/emacs.scm')
| -rw-r--r-- | gnu/packages/emacs.scm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index bbed0175d4..1756b82466 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -412,7 +412,9 @@ languages.") (source (origin (inherit (package-source emacs-next)) - (patches (search-patches "emacs-pgtk-super-key-fix.patch")))) + (patches + (append (search-patches "emacs-pgtk-super-key-fix.patch") + (origin-patches (package-source emacs-next)))))) (arguments (substitute-keyword-arguments (package-arguments emacs-next) ((#:configure-flags flags #~'()) |