From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Thompson Subject: [PATCH] build: ruby: Install executables in /bin. Date: Fri, 27 Feb 2015 14:04:14 -0500 Message-ID: <87ioen89ch.fsf@fsf.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:56891) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRQCw-0002ux-0o for guix-devel@gnu.org; Fri, 27 Feb 2015 14:04:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YRQCu-0003yy-Rp for guix-devel@gnu.org; Fri, 27 Feb 2015 14:04:17 -0500 Received: from mail.fsf.org ([208.118.235.13]:51106) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRQCu-0003yt-Om for guix-devel@gnu.org; Fri, 27 Feb 2015 14:04:16 -0500 Received: from 209-6-40-86.c3-0.smr-ubr1.sbo-smr.ma.cable.rcn.com ([209.6.40.86]:48210 helo=izanagi) by mail.fsf.org with esmtpsa (TLS-1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1YRQCt-0008Ta-KS for guix-devel@gnu.org; Fri, 27 Feb 2015 14:04:16 -0500 List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-build-ruby-Install-executables-in-bin.patch >From af6a7e03fc6debea314b88d616d035acc1b6ed50 Mon Sep 17 00:00:00 2001 From: David Thompson 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 --=-=-= Content-Type: text/plain -- David Thompson Web Developer - Free Software Foundation - http://fsf.org GPG Key: 0FF1D807 Support the FSF: https://fsf.org/donate --=-=-=--