From 62daa38457a3c0ad4c02662a916122af5bc7e01a Mon Sep 17 00:00:00 2001
From: Giacomo Leidi <goodoldpaul@autistici.org>
Date: Sun, 31 Dec 2023 22:45:49 +0100
Subject: 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>
---
 nonguix/build/chromium-binary-build-system.scm |  5 ++---
 nonguix/build/utils.scm                        | 20 --------------------
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/nonguix/build/chromium-binary-build-system.scm b/nonguix/build/chromium-binary-build-system.scm
index 0fed9bf..8429742 100644
--- a/nonguix/build/chromium-binary-build-system.scm
+++ b/nonguix/build/chromium-binary-build-system.scm
@@ -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
diff --git a/nonguix/build/utils.scm b/nonguix/build/utils.scm
index e7d6966..4de2ac2 100644
--- a/nonguix/build/utils.scm
+++ b/nonguix/build/utils.scm
@@ -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))))
-- 
cgit v1.2.3