[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/4] gnu: emacs: Find packages in "~/.guix-profile".
From: |
Alex Kost |
Subject: |
[PATCH 3/4] gnu: emacs: Find packages in "~/.guix-profile". |
Date: |
Wed, 6 Jan 2016 19:55:04 +0300 |
From: Federico Beffa <address@hidden>
* gnu/packages/emacs.scm (emacs)[inputs]: Add 'guix-src' input.
[arguments]: Add 'install-site-start' phase.
Co-authored-by: Alex Kost <address@hidden>
---
gnu/packages/emacs.scm | 49 ++++++++++++++++++++++++++++++++++---------------
1 file changed, 34 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index e82ffd3..54df2ed 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -52,6 +52,7 @@
#:use-module (gnu packages xml)
#:use-module (gnu packages glib)
#:use-module (gnu packages acl)
+ #:use-module (gnu packages package-management)
#:use-module (gnu packages perl)
#:use-module (gnu packages pdf)
#:use-module (gnu packages xiph)
@@ -73,20 +74,37 @@
(patches (list (search-patch "emacs-exec-path.patch")))))
(build-system glib-or-gtk-build-system)
(arguments
- '(#:phases (modify-phases %standard-phases
- (add-before 'configure 'fix-/bin/pwd
- (lambda _
- ;; Use `pwd', not `/bin/pwd'.
- (substitute* (find-files "." "^Makefile\\.in$")
- (("/bin/pwd")
- "pwd"))))
- (add-after 'install 'remove-info.info
- (lambda* (#:key outputs #:allow-other-keys)
- ;; Remove 'info.info', which is provided by Texinfo.
- (let ((out (assoc-ref outputs "out")))
- (delete-file
- (string-append out "/share/info/info.info.gz"))
- #t))))))
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'fix-/bin/pwd
+ (lambda _
+ ;; Use `pwd', not `/bin/pwd'.
+ (substitute* (find-files "." "^Makefile\\.in$")
+ (("/bin/pwd")
+ "pwd"))))
+ (add-after 'install 'remove-info.info
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; Remove 'info.info', which is provided by Texinfo.
+ (let ((out (assoc-ref outputs "out")))
+ (delete-file
+ (string-append out "/share/info/info.info.gz"))
+ #t)))
+ (add-after 'install 'install-site-start
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((guix-src (assoc-ref inputs "guix-src"))
+ (out (assoc-ref outputs "out"))
+ (lisp-dir (string-append out "/share/emacs/"
+ ,(version-major+minor version)
+ "/site-lisp"))
+ (unpack (assoc-ref %standard-phases 'unpack)))
+ (mkdir "guix")
+ (with-directory-excursion "guix"
+ (apply unpack (list #:source guix-src))
+ (install-file "emacs/guix-emacs.el" lisp-dir))
+ (with-output-to-file (string-append lisp-dir "/site-start.el")
+ (lambda ()
+ (display "(require 'guix-emacs nil t)")))
+ #t))))))
(inputs
`(("gnutls" ,gnutls)
("ncurses" ,ncurses)
@@ -111,7 +129,8 @@
("libice" ,libice)
("libsm" ,libsm)
("alsa-lib" ,alsa-lib)
- ("dbus" ,dbus)))
+ ("dbus" ,dbus)
+ ("guix-src" ,(package-source guix))))
(native-inputs
`(("pkg-config" ,pkg-config)
("texinfo" ,texinfo)))
--
2.6.3