aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2020-02-29 09:34:40 -0500
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2020-03-19 12:07:10 -0400
commit06ab895e8ccad6ad9e3131b863cba14924fc149a (patch)
treeb1aa8ee99e48bfb8f2960dab36bbaa6137a8498c
parent5e78a87bb99ca8f0c56ece90b871791abcd79b68 (diff)
downloadpatches-06ab895e8ccad6ad9e3131b863cba14924fc149a.tar
patches-06ab895e8ccad6ad9e3131b863cba14924fc149a.tar.gz
gnu: emacs-magit-svn: Use the emacs-build-system.
* gnu/packages/emacs-xyz.scm (emacs-magit-svn)[build-system]: Use the emacs-build-system. [arguments]: Remove.
-rw-r--r--gnu/packages/emacs-xyz.scm41
1 files changed, 2 insertions, 39 deletions
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 6682403ebc..cb216f536d 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -414,7 +414,7 @@ operations.")
(let ((commit "9e33ceee32f665db59909e1c00a667ccdd04178f"))
(package
(name "emacs-magit-svn")
- (version (git-version "2.2.1" "1" commit))
+ (version (git-version "2.2.1" "2" commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -424,48 +424,11 @@ operations.")
(sha256
(base32
"1mlqz8dh6jy5rv72lgkxv253dgh73fmbaidskicypapvbl3lr6xy"))))
- (build-system trivial-build-system)
- (native-inputs `(("emacs" ,emacs-minimal)))
+ (build-system emacs-build-system)
(propagated-inputs `(("dash" ,emacs-dash)
("with-editor" ,emacs-with-editor)
("magit" ,emacs-magit)
("transient" ,emacs-transient)))
- (arguments
- `(#:modules ((guix build utils)
- (guix build emacs-utils))
-
- #:builder
- (begin
- (use-modules (guix build utils)
- (guix build emacs-utils))
-
- (let ((emacs (string-append (assoc-ref %build-inputs "emacs")
- "/bin/emacs"))
- (magit (string-append (assoc-ref %build-inputs "magit")
- "/share/emacs/site-lisp"))
- (transient (string-append (assoc-ref %build-inputs "transient")
- "/share/emacs/site-lisp/guix.d/transient-"
- ,(package-version emacs-transient)))
- (dash (string-append (assoc-ref %build-inputs "dash")
- "/share/emacs/site-lisp/guix.d/dash-"
- ,(package-version emacs-dash)))
- (with-editor (string-append (assoc-ref %build-inputs "with-editor")
- "/share/emacs/site-lisp/guix.d/with-editor-"
- ,(package-version emacs-with-editor)))
- (source (assoc-ref %build-inputs "source"))
- (lisp-dir (string-append %output "/share/emacs/site-lisp")))
-
- (install-file (string-append source "/magit-svn.el")
- lisp-dir)
-
- (with-directory-excursion lisp-dir
- (parameterize ((%emacs emacs))
- (emacs-generate-autoloads ,name lisp-dir)
- (setenv "EMACSLOADPATH"
- (string-append ":" magit ":" transient
- ":" dash ":" with-editor))
- (emacs-batch-eval '(byte-compile-file "magit-svn.el"))))
- #t))))
(home-page "https://github.com/magit/magit-svn")
(synopsis "Git-SVN extension to Magit")
(description