summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Thompson <dthompson2@worcester.edu>2015-02-27 12:03:20 -0500
committerDavid Thompson <dthompson2@worcester.edu>2015-03-02 17:33:53 -0500
commitf3c96d474f36896413b90ed216457652bb1fa983 (patch)
tree3046302e258776bdf5cd68f180aa9fe4a7a84349
parent7e7c6a1ac06a8e04acbdc9bbfe9ccc039d188977 (diff)
downloadguix-f3c96d474f36896413b90ed216457652bb1fa983.tar.gz
build: ruby: Install executables in /bin.
* guix/build/ruby-build-system.scm (install): Add '--bindir' flag to gem
  command.
-rw-r--r--guix/build/ruby-build-system.scm9
1 files changed, 5 insertions, 4 deletions
diff --git a/guix/build/ruby-build-system.scm b/guix/build/ruby-build-system.scm
index 933788cf90..4221295d88 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