me/guix
Archived
1
0
Fork 0
Code Activity

gnu: rc: Simplify.

Browse source 
* gnu/packages/shells.scm (rc)[source]: Replace magic commit ID with the
tagged release. Use GIT-FILE-NAME.
[arguments]: Remove 'autoreconf' phase (relying on Guix's built-in
'bootstrap' phase instead) and adjust the ordering of 'patch-trip.rc'
accordingly.
This commit is contained in:
Tobias Geerinckx-Rice 2018-09-17 14:42:05 +02:00
parent 7c0ed27a8b
commit 487cf5aaf6
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gnu/packages/shells.scm
View file

@ -155,23 +155,18 @@ and syntax highlighting.")
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/rakitzis/rc.git") (url "https://github.com/rakitzis/rc.git")
;; commit name 'release: rc-1.7.4' (commit (string-append "v" version))))
(commit "c884da53a7c885d46ace2b92de78946855b18e92")))
(sha256 (sha256
(base32 (base32
"00mgzvrrh9w96xa85g4gjbsvq02f08k4jwjcdnxq7kyh5xgiw95l")) "0vj1h4pcg13vxsiydmmk87dr2sra9h4gwx0c4q6fjsiw4in78rrd"))
(file-name (string-append name "-" version "-checkout")))) (file-name (git-file-name name version))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
'("--with-edit=gnu") '("--with-edit=gnu")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after (add-before 'bootstrap 'patch-trip.rc
'unpack 'autoreconf
(lambda _ (zero? (system* "autoreconf" "-vfi"))))
(add-before
'autoreconf 'patch-trip.rc
(lambda _ (lambda _
(substitute* "trip.rc" (substitute* "trip.rc"
(("/bin/pwd") (which "pwd")) (("/bin/pwd") (which "pwd"))