me
/
guix
Archived
1
0
Fork 0
Code

Revert "gnu: emacs: Make strip-double-wrap more robust." 

This reverts commit b107a19ffb.

It causes too many rebuilds related to emacs-minimal, and fails with "No code
for module (guix build glib-or-gtk-build-system)".
master
Nicolas Goaziou 2020-11-03 12:07:18 +01:00
parent 51482b93b6
commit c41c089ad0
No known key found for this signature in database
GPG Key ID: DA00B4F048E92F2D
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gnu/packages/emacs.scm
View File

@ -123,9 +123,6 @@
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
`(#:tests? #f ; no check target `(#:tests? #f ; no check target
#:modules ((guix build glib-or-gtk-build-system)
(guix build utils)
(ice-9 match))
#:configure-flags (list "--with-modules" #:configure-flags (list "--with-modules"
"--with-cairo" "--with-cairo"
"--disable-build-details") "--disable-build-details")
@ -199,12 +196,17 @@
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Directly copy emacs-X.Y to emacs, so that it is not wrapped ;; 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 ;; 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") (with-directory-excursion (assoc-ref outputs "out")
(copy-file (copy-file (string-append
(match (find-files "bin" "^emacs-") "bin/emacs-"
((executable . _) executable)) ,(let ((this-version (package-version this-package)))
"bin/emacs") (or (false-if-exception
(version-major+minor+point this-version))
(version-major+minor this-version))))
"bin/emacs")
#t))) #t)))
(add-before 'reset-gzip-timestamps 'make-compressed-files-writable (add-before 'reset-gzip-timestamps 'make-compressed-files-writable
;; The 'reset-gzip-timestamps phase will throw a permission error ;; The 'reset-gzip-timestamps phase will throw a permission error