summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMathieu Othacehe <othacehe@gnu.org>2020-08-29 15:58:02 +0200
committerMathieu Othacehe <othacehe@gnu.org>2020-08-29 15:58:53 +0200
commit6c77a5040604ebb7c0196f47520cf5fcc30c2087 (patch)
treecfc781eb8e3a480cd9c19e4a3e8e1f73c3f6ee71 /gnu
parent0ec6b8afd7e7a6c288fbf48c5779f2e0bdaffb55 (diff)
Revert "gnu: emacs: Strip double wrap."
This reverts commit 0ec6b8afd7e7a6c288fbf48c5779f2e0bdaffb55 that prevents the load of Emacs packages.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/emacs.scm11
1 files changed, 0 insertions, 11 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 84c18896175..a338abc774b 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -191,17 +191,6 @@
191 (rename-file real wrapper)) 191 (rename-file real wrapper))
192 pdmp pdmp-real)) 192 pdmp pdmp-real))
193 #t)) 193 #t))
194 (add-after 'glib-or-gtk-wrap 'strip-double-wrap
195 (lambda* (#:key outputs #:allow-other-keys)
196 ;; Directly copy emacs-X.Y to emacs, so that it is not wrapped
197 ;; twice. This also fixes a minor issue, where WMs would not be
198 ;; able to track emacs back to emacs.desktop.
199 (with-directory-excursion (assoc-ref outputs "out")
200 (copy-file (string-append
201 "bin/emacs-"
202 ,(version-major+minor (package-version emacs)))
203 "bin/emacs")
204 #t)))
205 (add-before 'reset-gzip-timestamps 'make-compressed-files-writable 194 (add-before 'reset-gzip-timestamps 'make-compressed-files-writable
206 ;; The 'reset-gzip-timestamps phase will throw a permission error 195 ;; The 'reset-gzip-timestamps phase will throw a permission error
207 ;; if gzip files aren't writable then. This phase is needed when 196 ;; if gzip files aren't writable then. This phase is needed when