summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2020-11-03 12:07:18 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2020-11-03 12:07:18 +0100
commitc41c089ad0d686a2de1728147a1a2d921fa7c44c (patch)
tree9bb59a941eb56c4667fc07869b437d139663c44f /gnu
parent51482b93b66cb07a725ab2b934a903cf242adcbb (diff)
Revert "gnu: emacs: Make strip-double-wrap more robust."
This reverts commit b107a19ffb6a6abb7bde3436f3fa359071bd1f5c. It causes too many rebuilds related to emacs-minimal, and fails with "No code for module (guix build glib-or-gtk-build-system)".
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/emacs.scm18
1 files changed, 10 insertions, 8 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index baed0b2afa..4963379d74 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -123,9 +123,6 @@
(build-system glib-or-gtk-build-system)
(arguments
`(#:tests? #f ; no check target
- #:modules ((guix build glib-or-gtk-build-system)
- (guix build utils)
- (ice-9 match))
#:configure-flags (list "--with-modules"
"--with-cairo"
"--disable-build-details")
@@ -199,12 +196,17 @@
(lambda* (#:key outputs #:allow-other-keys)
;; Directly copy emacs-X.Y to emacs, so that it is not wrapped
;; twice. This also fixes a minor issue, where WMs would not be
- ;; able to track emacs back to emacs.desktop.
+ ;; able to track emacs back to emacs.desktop. The version is
+ ;; accessed using using THIS-PACKAGE so it "just works" for
+ ;; inherited Emacs packages of different versions.
(with-directory-excursion (assoc-ref outputs "out")
- (copy-file
- (match (find-files "bin" "^emacs-")
- ((executable . _) executable))
- "bin/emacs")
+ (copy-file (string-append
+ "bin/emacs-"
+ ,(let ((this-version (package-version this-package)))
+ (or (false-if-exception
+ (version-major+minor+point this-version))
+ (version-major+minor this-version))))
+ "bin/emacs")
#t)))
(add-before 'reset-gzip-timestamps 'make-compressed-files-writable
;; The 'reset-gzip-timestamps phase will throw a permission error