From c48899eba2f63bf55e5ad92ab2aafbf15e519eb5 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Thu, 21 Jul 2016 20:13:27 +0300 Subject: gnu: emacs: Install site-start.el in non-versioned directory. Reported by Ricardo Wurmus on #guix. * gnu/packages/emacs.scm (emacs)[arguments]: Put "site-start.el" in "/share/emacs/site-lisp" instead of "/share/emacs//site-lisp" to let inherited package with another version find it. --- gnu/packages/emacs.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 3fcf121dad..eed64f4a08 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -125,9 +125,7 @@ (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")) + (lisp-dir (string-append out "/share/emacs/site-lisp")) (unpack (assoc-ref %standard-phases 'unpack))) (mkdir "guix") (with-directory-excursion "guix" -- cgit v1.2.3 From 090bdb9e9134571bdac9520366489cfea82779d6 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Fri, 22 Jul 2016 09:50:36 +0300 Subject: gnu: emacs-solarized-theme: Remove unneeded dependencies. * gnu/packages/emacs.scm (emacs-solarized-theme)[propagated-inputs]: Remove 'emacs-f' and 'emacs-s'. --- gnu/packages/emacs.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index eed64f4a08..8dd728b378 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -2085,9 +2085,7 @@ It is built on top of the custom theme support in Emacs 24 or later.") "1ha3slc6d9wi9ilkhmwrzkvf308n6ph7b0k69pk369s9304awxzx")))) (build-system emacs-build-system) (propagated-inputs - `(("emacs-dash" ,emacs-dash) - ("emacs-f" ,emacs-f) - ("emacs-s" ,emacs-s))) + `(("emacs-dash" ,emacs-dash))) (home-page "http://github.com/bbatsov/solarized-emacs") (synopsis "Port of the Solarized theme for Emacs") (description -- cgit v1.2.3