guix-commits
[Top][All Lists]
Advanced

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

02/03: build: ruby: Install executables in /bin.


From: David Thompson
Subject: 02/03: build: ruby: Install executables in /bin.
Date: Mon, 02 Mar 2015 22:35:16 +0000

davexunit pushed a commit to branch master
in repository guix.

commit f3c96d474f36896413b90ed216457652bb1fa983
Author: David Thompson <address@hidden>
Date:   Fri Feb 27 12:03:20 2015 -0500

    build: ruby: Install executables in /bin.
    
    * guix/build/ruby-build-system.scm (install): Add '--bindir' flag to gem
      command.
---
 guix/build/ruby-build-system.scm |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/guix/build/ruby-build-system.scm b/guix/build/ruby-build-system.scm
index 933788c..4221295 100644
--- a/guix/build/ruby-build-system.scm
+++ b/guix/build/ruby-build-system.scm
@@ -61,13 +61,14 @@ directory."
           (match:substring (string-match "ruby-(.*)$"
                                          (assoc-ref inputs "ruby"))
                            1))
-         (gem-home (string-append (assoc-ref outputs "out")
-                                  "/lib/ruby/gems/"
-                                  ruby-version)))
+         (out (assoc-ref outputs "out"))
+         (gem-home (string-append out "/lib/ruby/gems/" ruby-version)))
     (setenv "GEM_HOME" gem-home)
     (mkdir-p gem-home)
     (zero? (system* "gem" "install" "--local"
-                    (first-matching-file "\\.gem$")))))
+                    (first-matching-file "\\.gem$")
+                    ;; Executables should go into /bin, not /lib/ruby/gems.
+                    "--bindir" (string-append out "/bin")))))
 
 (define %standard-phases
   (alist-cons-after



reply via email to

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