diff options
| author | Andreas Enge <andreas@enge.fr> | 2016-07-25 21:58:36 +0200 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2016-07-25 21:58:36 +0200 |
| commit | 14656f44959a519239910b88b783fa6adbbd8d40 (patch) | |
| tree | 0ece327363bc6ee3d0cacba13c751361091b6ca8 /gnu/packages/emacs.scm | |
| parent | d8eb912132ccdff955e3318fe549c5f7f674adf8 (diff) | |
| parent | 424a323e92d92284efcd30cf548d1f41c556d592 (diff) | |
| download | patches-14656f44959a519239910b88b783fa6adbbd8d40.tar patches-14656f44959a519239910b88b783fa6adbbd8d40.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/emacs.scm')
| -rw-r--r-- | gnu/packages/emacs.scm | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 926db42a46..5a718fa341 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -117,9 +117,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" @@ -2079,9 +2077,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 |