From 3a9677dd027fac4403c318a722d9dbe383722e26 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 28 Feb 2020 23:42:59 -0500 Subject: [PATCH 1/8] 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. --- gnu/packages/emacs-xyz.scm | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a9b36dd882..2ddf3c0645 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -291,7 +291,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 @@ -331,24 +331,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 -- 2.25.0