From f8aacd14fa1617b3ce8c235de4739112f391a570 Mon Sep 17 00:00:00 2001
From: Hilton Chain <hako@ultrarare.space>
Date: Tue, 6 Dec 2022 13:44:19 +0800
Subject: [PATCH] bootloader: Fix modules related build issue.

* rosenthal/bootloader/u-boot.scm: Fix modules related build issue.
* rosenthal/packages/gnome-xyz.scm: Likewise.
---
 rosenthal/bootloader/u-boot.scm  | 15 ++++++++-------
 rosenthal/packages/gnome-xyz.scm |  1 -
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/rosenthal/bootloader/u-boot.scm b/rosenthal/bootloader/u-boot.scm
index a3b64cf..0dbbb54 100644
--- a/rosenthal/bootloader/u-boot.scm
+++ b/rosenthal/bootloader/u-boot.scm
@@ -3,17 +3,13 @@
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 
 (define-module (rosenthal bootloader u-boot)
+  #:use-module (ice-9 format)
+  #:use-module (guix gexp)
   #:use-module (gnu bootloader)
   #:use-module (gnu bootloader u-boot)
-  #:use-module (guix gexp)
   #:use-module (rosenthal packages bootloaders)
   #:export (u-boot-rpi4-arm64-bootloader))
 
-;; Autoload Nonguix*, so we only have a soft dependency.
-;; * <https://gitlab.com/nonguix/nonguix>
-(module-autoload! (current-module)
-                  '(nongnu packages linux) '(raspberrypi-firmware))
-
 (define %rpi4-arm64-boot-config
   (plain-file "config.txt" (format #f "~
 enable_uart=1
@@ -27,10 +23,15 @@ kernel=u-boot.bin
   #~(lambda (bootloader device mount-point)
       (let ((u-boot (string-append bootloader "/libexec/u-boot.bin"))
             (install-dir (string-append mount-point "/boot")))
+        ;; Autoload Nonguix*, so we only have a soft dependency.
+        ;; * <https://gitlab.com/nonguix/nonguix>
+        (module-autoload! (current-module)
+                          '(nongnu packages linux) '(raspberrypi-firmware))
+
         ;; Install raspberrypi-firmware
         (for-each (lambda (file)
                     (install-file
-                     (string-append #$raspberrypi-firmware "/" file) install-dir))
+                     (string-append raspberrypi-firmware "/" file) install-dir))
                   '(;; VideoCore firmwares
                     "start4.elf"        ;basic
                     "start4x.elf"       ;camera drivers and codec
diff --git a/rosenthal/packages/gnome-xyz.scm b/rosenthal/packages/gnome-xyz.scm
index 754a7b0..3cde1ea 100644
--- a/rosenthal/packages/gnome-xyz.scm
+++ b/rosenthal/packages/gnome-xyz.scm
@@ -4,7 +4,6 @@
 
 (define-module (rosenthal packages gnome-xyz)
   #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (ice-9 string-fun)
   #:use-module (guix build-system gnu)
   #:use-module (guix gexp)
   #:use-module (guix git-download)