all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: David Thompson <dthompson2@worcester.edu>
To: guix-devel@gnu.org
Subject: [PATCH] build: ruby: Install executables in /bin.
Date: Fri, 27 Feb 2015 14:04:14 -0500	[thread overview]
Message-ID: <87ioen89ch.fsf@fsf.org> (raw)

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0001-build-ruby-Install-executables-in-bin.patch --]
[-- Type: text/x-diff, Size: 1475 bytes --]

From af6a7e03fc6debea314b88d616d035acc1b6ed50 Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Fri, 27 Feb 2015 12:03:20 -0500
Subject: [PATCH] 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 file 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
-- 
2.1.4


[-- Attachment #2: Type: text/plain, Size: 136 bytes --]


-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

             reply	other threads:[~2015-02-27 19:04 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-27 19:04 David Thompson [this message]
2015-02-28 19:44 ` [PATCH] build: ruby: Install executables in /bin Ludovic Courtès
2015-02-28 20:27   ` David Thompson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87ioen89ch.fsf@fsf.org \
    --to=dthompson2@worcester.edu \
    --cc=guix-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.