aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2020-02-28 23:42:59 -0500
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2020-03-19 13:08:49 -0400
commitcc96c9504d22c0a0a4a146436a74c24d348241ae (patch)
tree30138804fac459a084295c6c92185a9c73140120
parentfdffceeb0199b95e6d30a5a0cb36ca0b2ed5187d (diff)
downloadguix-cc96c9504d22c0a0a4a146436a74c24d348241ae.tar
guix-cc96c9504d22c0a0a4a146436a74c24d348241ae.tar.gz
gnu: emacs-magit: Remove obsolete make flags.
* gnu/packages/emacs-xyz.scm (emacs-magit): Remove make flags that were jadis required to reference external Elisp libraries. These are now made available through EMACSLOADPATH.
-rw-r--r--gnu/packages/emacs-xyz.scm18
1 files changed, 2 insertions, 16 deletions
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 0e7131faf3..62d1adcf74 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -295,7 +295,7 @@ on stdout instead of using a socket as the Emacsclient does.")
(let ((commit "c761d28d49e5238037512b898db0ec9b40d85770"))
(package
(name "emacs-magit")
- (version (git-version "2.90.1" "2" commit))
+ (version (git-version "2.90.1" "3" commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -335,24 +335,10 @@ on stdout instead of using a socket as the Emacsclient does.")
(guix build emacs-utils))
#:test-target "test"
#:tests? #f ; tests are not included in the release
-
#:make-flags
(list (string-append "PREFIX=" %output)
;; Don't put .el files in a sub-directory.
- (string-append "lispdir=" %output "/share/emacs/site-lisp")
- (string-append "DASH_DIR="
- (assoc-ref %build-inputs "dash")
- "/share/emacs/site-lisp/guix.d/dash-"
- ,(package-version emacs-dash))
- (string-append "WITH_EDITOR_DIR="
- (assoc-ref %build-inputs "with-editor")
- "/share/emacs/site-lisp/guix.d/with-editor-"
- ,(package-version emacs-with-editor))
- (string-append "TRANSIENT_DIR="
- (assoc-ref %build-inputs "transient")
- "/share/emacs/site-lisp/guix.d/transient-"
- ,(package-version emacs-transient)))
-
+ (string-append "lispdir=" %output "/share/emacs/site-lisp"))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch