aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Thompson <dthompson2@worcester.edu>2015-03-07 18:36:13 -0500
committerDavid Thompson <dthompson2@worcester.edu>2015-03-17 19:23:17 -0400
commit7578f6e32a9a1d37813ed5e3ccfeb29d2f6712c9 (patch)
treeda8ed8d6b2a05d2179396adc7ba071f13d14780b
parent5250a4f215de414f516850e48af2f91c9c17c066 (diff)
downloadguix-7578f6e32a9a1d37813ed5e3ccfeb29d2f6712c9.tar.gz
guix-7578f6e32a9a1d37813ed5e3ccfeb29d2f6712c9.zip
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.
-rw-r--r--guix/build/ruby-build-system.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/guix/build/ruby-build-system.scm b/guix/build/ruby-build-system.scm
index 1310c4a0b3..a143df467f 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"))
1))
(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"
56 +0100'>2019-12-07services: Add 'provenance-service-type'.Ludovic Courtès 2019-11-09services: 'fold-services' memoizes service values.Ludovic Courtès 2019-08-14remote: Remove '--system' argument.Jakob L. Kreuze 2019-05-10services: 'gc-root-service-type' now has a default value.Ludovic Courtès 2018-09-07services: 'instantiate-missing-services' reaches fixed point.Ludovic Courtès 2018-06-20services: boot: Take gexps instead of monadic gexps.Ludovic Courtès 2018-06-20services: Add description to core services.Ludovic Courtès 2018-06-20services: cleanup: Expect file names to be UTF-8-encoded.Ludovic Courtès 2018-06-20services: boot: Reverse the order of boot expressions.Ludovic Courtès 2018-04-08discovery: Remove dependency on (guix ui).Ludovic Courtès 2018-03-29gnu: Refactor boot-service-type and activation-service-type.Chris Marusich 2018-01-21services: Missing services are automatically instantiated.Ludovic Courtès 2017-12-17services: cleanup: Remove "/run/udev/watch.old" directory.Danny Milosavljevic 2017-11-08services: Add 'lookup-service-types'.Ludovic Courtès 2017-11-08services: 'fold-service-types' includes (gnu services).Ludovic Courtès 2017-11-08services: 'fold-service-types' honors its seed.Ludovic Courtès 2017-10-22gexp: Add 'directory-union'.Ludovic Courtès 2017-10-22gexp: Add 'file-union'.Ludovic Courtès 2017-10-12services: cleanup: Remove Shadow lock files from /etc.Ludovic Courtès 2017-09-22services: network-manager: Add support for VPN plug-ins.Ludovic Courtès 2017-09-16services: Add 'fold-service-types'.Ludovic Courtès 2017-09-16services: Add a description and location for each service type.Ludovic Courtès 2017-07-11services: Make error message less scary.Ludovic Courtès 2017-05-03ui: Rename '_' to 'G_'.Ludovic Courtès 2017-04-16services: Service types can now specify a default value for instances.Ludovic Courtès 2017-04-16services: 'service-parameters' becomes 'service-value'.Ludovic Courtès 2017-04-13services: Define '%linux-bare-metal-service' using 'simple-service'.Ludovic Courtès 2017-03-10services: Create /var/log upon activation.Christopher Baines 2017-02-08services: Add 'special-files-service-type'.Ludovic Courtès 2017-01-24services: Create /var/log/wtmp upon activation.Ludovic Courtès 2017-01-19services: Create /var/run/utmpx upon activation.Ludovic Courtès