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

gnu: ruby: Fix build failures after updating to 2.4.2. 

* gnu/packages/ruby.scm (gem-directory): New procedure.
(ruby-ansi, ruby-ae)[arguments]: Use it to determine gem install directory
instead of relying on the ruby (patch) version.
This commit is contained in:
Marius Bakke 2017-09-24 20:10:57 +02:00
parent 4f27a33371
commit 859620e51d
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gnu/packages/ruby.scm
View File

@ -195,6 +195,11 @@ a focus on simplicity and productivity.")
(("/bin/sh") (which "sh"))) (("/bin/sh") (which "sh")))
#t))))))) #t)))))))
(define (gem-directory ruby-version)
"Return the relative gem install directory for RUBY-VERSION."
(string-append "/lib/ruby/gems/" (version-major+minor ruby-version)
".0/gems"))
(define-public ruby-hoe (define-public ruby-hoe
(package (package
(name "ruby-hoe") (name "ruby-hoe")
@ -3585,10 +3590,9 @@ It has built-in support for the legacy @code{cookies.txt} and
(add-before 'validate-runpath 'replace-broken-symlink (add-before 'validate-runpath 'replace-broken-symlink
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(file (string-append out "/lib/ruby/gems/" (file (string-append out
,(package-version ruby) ,(gem-directory (package-version ruby))
"/gems/ansi-" ,version "/ansi-" ,version "/lib/ansi.yml")))
"/lib/ansi.yml")))
;; XXX: This symlink is broken since ruby 2.4. ;; XXX: This symlink is broken since ruby 2.4.
;; https://lists.gnu.org/archive/html/guix-devel/2017-06/msg00034.html ;; https://lists.gnu.org/archive/html/guix-devel/2017-06/msg00034.html
(delete-file file) (delete-file file)
@ -3786,10 +3790,9 @@ requirement specifications systems like Cucumber.")
(add-before 'validate-runpath 'replace-broken-symlink (add-before 'validate-runpath 'replace-broken-symlink
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(file (string-append out "/lib/ruby/gems/" (file (string-append out
,(package-version ruby) ,(gem-directory (package-version ruby))
"/gems/ae-" ,version "/ae-" ,version "/lib/ae.yml")))
"/lib/ae.yml")))
;; XXX: This symlink is broken since ruby 2.4. ;; XXX: This symlink is broken since ruby 2.4.
;; https://lists.gnu.org/archive/html/guix-devel/2017-06/msg00034.html ;; https://lists.gnu.org/archive/html/guix-devel/2017-06/msg00034.html
(delete-file file) (delete-file file)