[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: build: ruby: Set $GEM_HOME that matches Ruby's $GEM_PATH.

From: David Thompson
Subject: 01/01: build: ruby: Set $GEM_HOME that matches Ruby's $GEM_PATH.
Date: Tue, 17 Mar 2015 23:54:20 +0000

davexunit pushed a commit to branch master
in repository guix.

commit 7578f6e32a9a1d37813ed5e3ccfeb29d2f6712c9
Author: David Thompson <address@hidden>
Date:   Sat Mar 7 18:36:13 2015 -0500

    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.
 guix/build/ruby-build-system.scm |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/guix/build/ruby-build-system.scm b/guix/build/ruby-build-system.scm
index 1310c4a..a143df4 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"))
          (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"

reply via email to

[Prev in Thread] Current Thread [Next in Thread]