build/chromium-binary: Use 'add-input-labels' for host-inputs labels.

* nonguix/build-system/chromium-binary.scm (add-input-labels): New procedure.
(lower) <host-inputs>: Remove labels.  Adjust accordingly.
* nonguix/build/chromium-binary-build-system.scm
(install-wrapper): Adjust for label change of fontconfig-minimal.

Signed-off-by: Hilton Chain <hako@ultrarare.space>

2 files changed, 59 insertions, 56 deletions

diff --git a/nonguix/build-system/chromium-binary.scm b/nonguix/build-system/chromium-binary.scm
index 4a5baaf4..6963982f 100644
--- a/nonguix/build-system/chromium-binary.scm
+++ b/nonguix/build-system/chromium-binary.scm
@@ -44,6 +44,9 @@
 ;;
 ;; Code:
 
+(define add-input-labels
+  (@@ (guix packages) add-input-labels))
+
 (define %chromium-binary-build-system-modules
   ;; Build-side modules imported by default.
   `((nonguix build chromium-binary-build-system)
@@ -72,61 +75,61 @@
   (define private-keywords
     '(#:target #:patchelf #:inputs #:native-inputs))
   (define host-inputs
-    `(,@(if source
-            `(("source" ,source))
-            '())
-
-      ,@inputs
-
-      ("alsa-lib" ,alsa-lib)
-      ("atk" ,atk)
-      ("at-spi2-atk" ,at-spi2-atk)
-      ("at-spi2-core" ,at-spi2-core)
-      ("bash-minimal" ,bash-minimal)
-      ("cairo" ,cairo)
-      ("cups" ,cups)
-      ("dbus" ,dbus)
-      ("eudev" ,eudev)
-      ("expat" ,expat)
-      ("fontconfig" ,fontconfig)
-      ("freetype" ,freetype)
-      ("gcc:lib" ,gcc "lib")
-      ("glib" ,glib)
-      ("gtk+" ,gtk+)
-      ("libdrm" ,libdrm)
-      ("libnotify" ,libnotify)
-      ("librsvg" ,librsvg)
-      ("libsecret" ,libsecret)
-      ("libx11" ,libx11)
-      ("libxcb" ,libxcb)
-      ("libxcomposite" ,libxcomposite)
-      ("libxcursor" ,libxcursor)
-      ("libxdamage" ,libxdamage)
-      ("libxext" ,libxext)
-      ("libxfixes" ,libxfixes)
-      ("libxi" ,libxi)
-      ("libxkbcommon" ,libxkbcommon)
-      ("libxkbfile" ,libxkbfile)
-      ("libxrandr" ,libxrandr)
-      ("libxrender" ,libxrender)
-      ("libxshmfence" ,libxshmfence)
-      ("libxtst" ,libxtst)
-      ("mesa" ,mesa)
-      ("mit-krb5" ,mit-krb5)
-      ("nspr" ,nspr)
-      ("nss" ,nss)
-      ("pango" ,pango)
-      ("pulseaudio" ,pulseaudio)
-      ("sqlcipher" ,sqlcipher)
-      ("xcb-util" ,xcb-util)
-      ("xcb-util-image" ,xcb-util-image)
-      ("xcb-util-keysyms" ,xcb-util-keysyms)
-      ("xcb-util-renderutil" ,xcb-util-renderutil)
-      ("xcb-util-wm" ,xcb-util-wm)
-      ("zlib" ,zlib)
-
-      ;; Keep the standard inputs of 'gnu-build-system'.
-      ,@(standard-packages)))
+    (append
+     (if source
+         `(("source" ,source))
+         '())
+     inputs
+     ;; Inputs needed by the Electron.
+     (add-input-labels
+      alsa-lib
+      atk
+      at-spi2-atk
+      at-spi2-core
+      bash-minimal
+      cairo
+      cups
+      dbus
+      eudev
+      expat
+      fontconfig
+      freetype
+      `(,gcc "lib")
+      glib
+      gtk+
+      libdrm
+      libnotify
+      librsvg
+      libsecret
+      libx11
+      libxcb
+      libxcomposite
+      libxcursor
+      libxdamage
+      libxext
+      libxfixes
+      libxi
+      libxkbcommon
+      libxkbfile
+      libxrandr
+      libxrender
+      libxshmfence
+      libxtst
+      mesa
+      mit-krb5
+      nspr
+      nss
+      pango
+      pulseaudio
+      sqlcipher
+      xcb-util
+      xcb-util-image
+      xcb-util-keysyms
+      xcb-util-renderutil
+      xcb-util-wm
+      zlib)
+     ;; Keep the standard inputs of 'gnu-build-system'.
+     (standard-packages)))
 
   (and (not target)                     ;XXX: no cross-compilation
        (bag
diff --git a/nonguix/build/chromium-binary-build-system.scm b/nonguix/build/chromium-binary-build-system.scm
index 0295891d..30e59f1e 100644
--- a/nonguix/build/chromium-binary-build-system.scm
+++ b/nonguix/build/chromium-binary-build-system.scm
@@ -19,7 +19,7 @@
 (define* (install-wrapper #:key inputs outputs #:allow-other-keys)
   (let* ((output (assoc-ref outputs "out"))
          (bin (string-append output "/bin"))
-         (fontconfig-minimal (assoc-ref inputs "fontconfig"))
+         (fontconfig-minimal (assoc-ref inputs "fontconfig-minimal"))
          (nss (assoc-ref inputs "nss"))
          (wrap-inputs (map cdr inputs))
          (lib-directories