mirror of
https://gitlab.com/nonguix/nonguix.git
synced 2024-11-21 16:08:07 +01:00
nonguix: chromium-binary: Use search-path-as-list from (guix build utils).
We rely on the upstream implementation to avoid duplicating effort. * nonguix/build/chromium-binary-build-system (install-wrapper): Use search-path-as-list; * nonguix/build/utils.scm (build-paths-for-input): remove variable; (build-paths-from-inputs): remove variable. Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
This commit is contained in:
parent
185176c8fa
commit
62daa38457
2 changed files with 2 additions and 23 deletions
|
@ -4,7 +4,6 @@
|
|||
(define-module (nonguix build chromium-binary-build-system)
|
||||
#:use-module ((guix build gnu-build-system) #:prefix gnu:)
|
||||
#:use-module ((nonguix build binary-build-system) #:prefix binary:)
|
||||
#:use-module (nonguix build utils)
|
||||
#:use-module (guix build utils)
|
||||
#:use-module (ice-9 ftw)
|
||||
#:use-module (ice-9 match)
|
||||
|
@ -24,9 +23,9 @@
|
|||
(nss (assoc-ref inputs "nss"))
|
||||
(wrap-inputs (map cdr inputs))
|
||||
(lib-directories
|
||||
(build-paths-from-inputs '("lib") wrap-inputs))
|
||||
(search-path-as-list '("lib") wrap-inputs))
|
||||
(bin-directories
|
||||
(build-paths-from-inputs
|
||||
(search-path-as-list
|
||||
'("bin" "sbin" "libexec")
|
||||
wrap-inputs)))
|
||||
(for-each
|
||||
|
|
|
@ -97,23 +97,3 @@ contents:
|
|||
(call-with-output-file result
|
||||
(lambda (port)
|
||||
(for-each (cut dump <> port) files))))
|
||||
|
||||
(define build-paths-for-input
|
||||
(lambda (dirs input)
|
||||
(filter-map
|
||||
(lambda (sub-directory)
|
||||
(let ((directory
|
||||
(string-append
|
||||
input "/" sub-directory)))
|
||||
(and
|
||||
(directory-exists? directory)
|
||||
directory)))
|
||||
dirs)))
|
||||
|
||||
(define build-paths-from-inputs
|
||||
(lambda (dirs inputs)
|
||||
(reduce append '()
|
||||
(map
|
||||
(lambda (input)
|
||||
(build-paths-for-input dirs input))
|
||||
inputs))))
|
||||
|
|
Loading…
Reference in a new issue