mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 05:18:07 -05:00
gnu: git: Add graphical tools to the "gui" output.
* gnu/packages/version-control.scm (git): Add "gui" output. Add Tcl/Tk as inputs. Add #:configure-flags. Augment 'split' phase to handle graphical user interfaces.
This commit is contained in:
parent
0a5a1db2d4
commit
ecfb69938a
1 changed files with 34 additions and 6 deletions
|
@ -39,7 +39,8 @@ (define-module (gnu packages version-control)
|
|||
#:use-module (gnu packages xml)
|
||||
#:use-module (gnu packages emacs)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages swig))
|
||||
#:use-module (gnu packages swig)
|
||||
#:use-module (gnu packages tcl))
|
||||
|
||||
(define-public bazaar
|
||||
(package
|
||||
|
@ -93,12 +94,25 @@ (define-public git
|
|||
("zlib" ,zlib)
|
||||
|
||||
;; For 'git-svn'.
|
||||
("subversion" ,subversion)))
|
||||
(outputs '("out" "svn"))
|
||||
("subversion" ,subversion)
|
||||
|
||||
;; For 'git gui', 'gitk', and 'git citool'.
|
||||
("tcl" ,tcl)
|
||||
("tk" ,tk)))
|
||||
(outputs '("out" ; the core
|
||||
"svn" ; git-svn
|
||||
"gui")) ; gitk, git gui
|
||||
(arguments
|
||||
`(#:make-flags `("V=1") ; more verbose compilation
|
||||
#:test-target "test"
|
||||
#:tests? #f ; FIXME: Many tests are failing
|
||||
|
||||
;; The explicit --with-tcltk forces the build system to hardcode the
|
||||
;; absolute file name to 'wish'.
|
||||
#:configure-flags (list (string-append "--with-tcltk="
|
||||
(assoc-ref %build-inputs "tk")
|
||||
"/bin/wish8.6")) ; XXX
|
||||
|
||||
#:phases
|
||||
(alist-replace
|
||||
'configure
|
||||
|
@ -112,14 +126,28 @@ (define-public git
|
|||
(alist-cons-after
|
||||
'install 'split
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
;; Split the binaries to the various outputs.
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(svn (assoc-ref outputs "svn"))
|
||||
(gui (assoc-ref outputs "gui"))
|
||||
(gitk (string-append out "/bin/gitk"))
|
||||
(gitk* (string-append gui "/bin/gitk"))
|
||||
(git-gui (string-append out "/libexec/git-core/git-gui"))
|
||||
(git-gui* (string-append gui "/libexec/git-core/git-gui"))
|
||||
(git-cit (string-append out "/libexec/git-core/git-citool"))
|
||||
(git-cit* (string-append gui "/libexec/git-core/git-citool"))
|
||||
(git-svn (string-append out "/libexec/git-core/git-svn"))
|
||||
(git-svn* (string-append svn "/libexec/git-core/git-svn")))
|
||||
(mkdir-p (string-append gui "/bin"))
|
||||
(mkdir-p (string-append gui "/libexec/git-core"))
|
||||
(mkdir-p (string-append svn "/libexec/git-core"))
|
||||
(copy-file git-svn git-svn*)
|
||||
(delete-file git-svn)
|
||||
(chmod git-svn* #o555)
|
||||
|
||||
(for-each (lambda (old new)
|
||||
(copy-file old new)
|
||||
(delete-file old)
|
||||
(chmod new #o555))
|
||||
(list gitk git-gui git-cit git-svn)
|
||||
(list gitk* git-gui* git-cit* git-svn*))
|
||||
|
||||
;; Tell 'git-svn' where Subversion is.
|
||||
(wrap-program git-svn*
|
||||
|
|
Loading…
Reference in a new issue