nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

guix: ruby-build-system: Extract gemspec during 'extract-gemspec'. 

* guix/build/ruby-build-system.scm (build): Move extraction from here ...
(extract-gemspec): ... to here.  New variable.
(first-gemspec): New variable.
(%standard-phases): Add 'extract-gemspec' phase.
This commit is contained in:
Ben Woodcroft 2016-05-22 08:46:39 +10:00
parent 2301195f2e
commit 25c288cbf1
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
guix/build/ruby-build-system.scm
View File

@ -66,14 +66,13 @@ directory."
;; Use GNU unpack strategy for things that aren't gem archives. ;; Use GNU unpack strategy for things that aren't gem archives.
(gnu:unpack #:source source))) (gnu:unpack #:source source)))
(define* (build #:key source #:allow-other-keys) (define (first-gemspec)
"Build a new gem using the gemspec from the SOURCE gem." (first-matching-file "\\.gemspec$"))
(define (first-gemspec)
(first-matching-file "\\.gemspec$"))
;; Remove the original gemspec, if present, and replace it with a new one. (define* (extract-gemspec #:key source #:allow-other-keys)
;; This avoids issues with upstream gemspecs requiring tools such as git to "Remove the original gemspec, if present, and replace it with a new one.
;; generate the files list. This avoids issues with upstream gemspecs requiring tools such as git to
generate the files list."
(when (gem-archive? source) (when (gem-archive? source)
(let ((gemspec (or (false-if-exception (first-gemspec)) (let ((gemspec (or (false-if-exception (first-gemspec))
;; Make new gemspec if one wasn't shipped. ;; Make new gemspec if one wasn't shipped.
@ -94,7 +93,10 @@ directory."
(write-char (read-char pipe) out)))) (write-char (read-char pipe) out))))
#t) #t)
(lambda () (lambda ()
(close-pipe pipe)))))) (close-pipe pipe)))))))
(define* (build #:key source #:allow-other-keys)
"Build a new gem using the gemspec from the SOURCE gem."
;; Build a new gem from the current working directory. This also allows any ;; Build a new gem from the current working directory. This also allows any
;; dynamic patching done in previous phases to be present in the installed ;; dynamic patching done in previous phases to be present in the installed
@ -134,6 +136,7 @@ GEM-FLAGS are passed to the 'gem' invokation, if present."
(define %standard-phases (define %standard-phases
(modify-phases gnu:%standard-phases (modify-phases gnu:%standard-phases
(delete 'configure) (delete 'configure)
(add-before 'build 'extract-gemspec extract-gemspec)
(replace 'build build) (replace 'build build)
(replace 'unpack unpack) (replace 'unpack unpack)
(replace 'install install) (replace 'install install)