diff options
author | Mark H Weaver <mhw@netris.org> | 2015-04-17 09:54:11 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2015-04-17 09:54:11 -0400 |
commit | 933204e5b1473a54367aef1f90de22424e9074ab (patch) | |
tree | d0ccfee2b903c5fac827bc4a52ec7de17bdc1e7b /gnu/packages/emacs.scm | |
parent | 9128e323c0a23243c3f70b1716c68ad0b241f30d (diff) | |
parent | 5e25ebe2fa70297d094fe891b81c4970e45a906a (diff) | |
download | guix-933204e5b1473a54367aef1f90de22424e9074ab.tar.gz |
Merge branch 'master' into core-updates
Conflicts: gnu-system.am gnu/packages/gstreamer.scm
Diffstat (limited to 'gnu/packages/emacs.scm')
-rw-r--r-- | gnu/packages/emacs.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 5eb9c4b44a..8d3df368b1 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -64,7 +64,8 @@ version ".tar.xz")) (sha256 (base32 - "0kn3rzm91qiswi0cql89kbv6mqn27rwsyjfb8xmwy9m5s8fxfiyx")))) + "0kn3rzm91qiswi0cql89kbv6mqn27rwsyjfb8xmwy9m5s8fxfiyx")) + (patches (list (search-patch "emacs-exec-path.patch"))))) (build-system glib-or-gtk-build-system) (arguments '(#:phases (alist-cons-before |