summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Thompson <dthompson2@worcester.edu>2015-03-07 18:36:13 -0500
committerDavid Thompson <dthompson2@worcester.edu>2015-03-17 19:23:17 -0400
commit7578f6e32a9a1d37813ed5e3ccfeb29d2f6712c9 (patch)
treeda8ed8d6b2a05d2179396adc7ba071f13d14780b
parent5250a4f215de414f516850e48af2f91c9c17c066 (diff)
downloadguix-7578f6e32a9a1d37813ed5e3ccfeb29d2f6712c9.tar.gz
build: ruby: Set $GEM_HOME that matches Ruby's $GEM_PATH.
* guix/build/ruby-build-system.scm (install): Ignore the Ruby patch version
  when creating $GEM_HOME.
-rw-r--r--guix/build/ruby-build-system.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/guix/build/ruby-build-system.scm b/guix/build/ruby-build-system.scm
index 1310c4a0b3..a143df467f 100644
--- a/guix/build/ruby-build-system.scm
+++ b/guix/build/ruby-build-system.scm
@@ -58,11 +58,11 @@ directory."
 
 (define* (install #:key source inputs outputs #:allow-other-keys)
   (let* ((ruby-version
-          (match:substring (string-match "ruby-(.*)$"
+          (match:substring (string-match "ruby-(.*)\\.[0-9]$"
                                          (assoc-ref inputs "ruby"))
                            1))
          (out (assoc-ref outputs "out"))
-         (gem-home (string-append out "/lib/ruby/gems/" ruby-version)))
+         (gem-home (string-append out "/lib/ruby/gems/" ruby-version ".0")))
     (setenv "GEM_HOME" gem-home)
     (mkdir-p gem-home)
     (zero? (system* "gem" "install" "--local"