diff options
| author | Christopher Baines <mail@cbaines.net> | 2017-12-17 08:25:44 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2018-01-14 22:16:08 +0000 |
| commit | 3cb3fa6747251c6beac226d0233063524bd5f4d6 (patch) | |
| tree | e49127e5a47d483e5efda64c1e9ed8eb51569c97 /gnu/packages/databases.scm | |
| parent | b1225dd30f6cf0d6700beafcd73a5bba413c6f76 (diff) | |
| download | guix-3cb3fa6747251c6beac226d0233063524bd5f4d6.tar guix-3cb3fa6747251c6beac226d0233063524bd5f4d6.tar.gz | |
guix: build: ruby-build-system: Install to the vendor directory
* guix/build/ruby-build-system.scm (install): Install gems to the vendor
directory, rather than the GEM_HOME. The vendor directory does not include
the version of ruby used to install the gem in the path, which makes it
easier to add it to the GEM_PATH for all versions of ruby to use.
(gem-home): Remove procedure.
* gnu/packages/ruby.scm (ruby, ruby-2.1)[native-search-paths]: Switch to
lib/ruby/vendor_ruby.
(ruby-1.8)[native-search-paths]: Remove native-search-paths.
(gem-directory): Remove procedure.
(ruby-ansi, ruby-ae)[arguments]: Remove use of gem-directory.
(ruby-metaclass, ruby-instantiator, ruby-introspection, ruby-mocha,
ruby-nokogiri, ruby-minitest-tu-shim, ruby-redcloth)[arguments]: Remove use
of gem-home.
(ruby-git, ruby-httpclient)[arguments]: Remove use of GEM_HOME.
* gnu/packages/databases.scm (es-dump-restore)[arguments]: Remove use of
GEM_HOME.
Diffstat (limited to 'gnu/packages/databases.scm')
| -rw-r--r-- | gnu/packages/databases.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 86beb762bb..d7bcce44e7 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -298,10 +298,10 @@ SQL, Key/Value, XML/XQuery or Java Object storage for their data model.") (lambda* (#:key outputs #:allow-other-keys) (wrap-program (string-append (assoc-ref outputs "out") "/bin/es_dump_restore") - `("GEM_PATH" ":" prefix (,(string-append - (getenv "GEM_PATH") - ":" - (getenv "GEM_HOME"))))) + `("GEM_PATH" ":" prefix (,(getenv "GEM_PATH") + ,(string-append + (assoc-ref outputs "out") + "/lib/ruby/vendor_ruby")))) #t))))) (propagated-inputs `(("ruby-httpclient" ,ruby-httpclient) |