Lispln/nonguix
1
0
Fork 0
mirror of https://gitlab.com/nonguix/nonguix.git synced 2024-11-22 08:28:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

nonguix: chromium-binary: Use search-path-as-list from (guix build utils).

Browse source 
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:
Giacomo Leidi 2023-12-31 22:45:49 +01:00 committed by Jonathan Brielmaier
parent 185176c8fa
commit 62daa38457
No known key found for this signature in database
GPG key ID: ECFC83988B4E4B9F
2 changed files with 2 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
nonguix/build/chromium-binary-build-system.scm
View file

@ -4,7 +4,6 @@
(define-module (nonguix build chromium-binary-build-system) (define-module (nonguix build chromium-binary-build-system)
#:use-module ((guix build gnu-build-system) #:prefix gnu:) #:use-module ((guix build gnu-build-system) #:prefix gnu:)
#:use-module ((nonguix build binary-build-system) #:prefix binary:) #:use-module ((nonguix build binary-build-system) #:prefix binary:)
#:use-module (nonguix build utils)
#:use-module (guix build utils) #:use-module (guix build utils)
#:use-module (ice-9 ftw) #:use-module (ice-9 ftw)
#:use-module (ice-9 match) #:use-module (ice-9 match)
@ -24,9 +23,9 @@
(nss (assoc-ref inputs "nss")) (nss (assoc-ref inputs "nss"))
(wrap-inputs (map cdr inputs)) (wrap-inputs (map cdr inputs))
(lib-directories (lib-directories
(build-paths-from-inputs '("lib") wrap-inputs)) (search-path-as-list '("lib") wrap-inputs))
(bin-directories (bin-directories
(build-paths-from-inputs (search-path-as-list
'("bin" "sbin" "libexec") '("bin" "sbin" "libexec")
wrap-inputs))) wrap-inputs)))
(for-each (for-each

20
nonguix/build/utils.scm
View file

@ -97,23 +97,3 @@ contents:
(call-with-output-file result (call-with-output-file result
(lambda (port) (lambda (port)
(for-each (cut dump <> port) files)))) (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))))