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

Revert "build-system/ruby: Use invoke." 

This reverts commit 0244952c11.

We prefer 'invoke', but the custom error handling works better with the
code as-is.
This commit is contained in:
Efraim Flashner 2019-03-28 20:18:02 +02:00
parent 0244952c11
commit 7c86fdda7c
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,13 +143,16 @@ GEM-FLAGS are passed to the 'gem' invokation, if present."
(gem-dir (string-append vendor-dir "/gems/" gem-name))) (gem-dir (string-append vendor-dir "/gems/" gem-name)))
(setenv "GEM_VENDOR" vendor-dir) (setenv "GEM_VENDOR" vendor-dir)
(or (apply invoke "gem" "install" gem-file (or (zero?
"--verbose" ;; 'zero? system*' allows the custom error handling to function as
"--local" "--ignore-dependencies" "--vendor" ;; expected, while 'invoke' raises its own exception.
;; Executables should go into /bin, not (apply system* "gem" "install" gem-file
;; /lib/ruby/gems. "--verbose"
"--bindir" (string-append out "/bin") "--local" "--ignore-dependencies" "--vendor"
gem-flags) ;; Executables should go into /bin, not
;; /lib/ruby/gems.
"--bindir" (string-append out "/bin")
gem-flags))
(begin (begin
(let ((failed-output-dir (string-append (getcwd) "/out"))) (let ((failed-output-dir (string-append (getcwd) "/out")))
(mkdir failed-output-dir) (mkdir failed-output-dir)