mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 05:18:07 -05:00
gnu: Remove redundant wrapping from packages using ruby-build-system.
Now that the build system does wrapping automatically, it can be removed from the packages that do it manually. * gnu/packages/databases.scm (es-dump-restore)[arguments]: Remove #:phases. * gnu/packages/ruby.scm (ruby-redcloth)[arguments]: Remove #:phases. (ruby-httpclient)[arguments]: Remove 'wrap-bin-httpclient from the modified phases.
This commit is contained in:
parent
2c2ec3d04a
commit
0076f5a98c
2 changed files with 3 additions and 30 deletions
|
@ -291,18 +291,7 @@ (define-public es-dump-restore
|
||||||
"020yk7f1hw48clmf5501z3xv9shsdchyymcv0y2cci2c1xvr1mim"))))
|
"020yk7f1hw48clmf5501z3xv9shsdchyymcv0y2cci2c1xvr1mim"))))
|
||||||
(build-system ruby-build-system)
|
(build-system ruby-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
'(#:tests? #f ;; No testsuite.
|
'(#:tests? #f)) ;; No testsuite.
|
||||||
#:phases
|
|
||||||
(modify-phases %standard-phases
|
|
||||||
(add-after 'install 'wrap-bin-es_dump_restore
|
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
|
||||||
(wrap-program (string-append (assoc-ref outputs "out")
|
|
||||||
"/bin/es_dump_restore")
|
|
||||||
`("GEM_PATH" ":" prefix (,(getenv "GEM_PATH")
|
|
||||||
,(string-append
|
|
||||||
(assoc-ref outputs "out")
|
|
||||||
"/lib/ruby/vendor_ruby"))))
|
|
||||||
#t)))))
|
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
`(("ruby-httpclient" ,ruby-httpclient)
|
`(("ruby-httpclient" ,ruby-httpclient)
|
||||||
("ruby-multi-json" ,ruby-multi-json)
|
("ruby-multi-json" ,ruby-multi-json)
|
||||||
|
|
|
@ -2852,17 +2852,7 @@ (define-public ruby-redcloth
|
||||||
;; existing gemspec.
|
;; existing gemspec.
|
||||||
(replace 'build
|
(replace 'build
|
||||||
(lambda _
|
(lambda _
|
||||||
(zero? (system* "gem" "build" "redcloth.gemspec"))))
|
(zero? (system* "gem" "build" "redcloth.gemspec")))))))
|
||||||
;; Make sure that the "redcloth" executable finds required Ruby
|
|
||||||
;; libraries.
|
|
||||||
(add-after 'install 'wrap-bin-redcloth
|
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
|
||||||
(wrap-program (string-append (assoc-ref outputs "out")
|
|
||||||
"/bin/redcloth")
|
|
||||||
`("GEM_PATH" ":" prefix (,(string-append
|
|
||||||
(assoc-ref outputs "out")
|
|
||||||
"/lib/ruby/vendor_ruby"))))
|
|
||||||
#t)))))
|
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("bundler" ,bundler)
|
`(("bundler" ,bundler)
|
||||||
("ruby-diff-lcs" ,ruby-diff-lcs)
|
("ruby-diff-lcs" ,ruby-diff-lcs)
|
||||||
|
@ -3710,13 +3700,7 @@ (define-public ruby-httpclient
|
||||||
(system* "ruby"
|
(system* "ruby"
|
||||||
"-Ilib"
|
"-Ilib"
|
||||||
"test/runner.rb"))
|
"test/runner.rb"))
|
||||||
#t)))
|
#t))))))
|
||||||
(add-after 'install 'wrap-bin-httpclient
|
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
|
||||||
(wrap-program (string-append (assoc-ref outputs "out")
|
|
||||||
"/bin/httpclient")
|
|
||||||
`("GEM_PATH" ":" prefix (,(getenv "GEM_PATH"))))
|
|
||||||
#t)))))
|
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("ruby-rack" ,ruby-rack)))
|
`(("ruby-rack" ,ruby-rack)))
|
||||||
(synopsis
|
(synopsis
|
||||||
|
|
Loading…
Reference in a new issue