From 6c2ae977a7f36b7b8bd8d87c9f2a0cf32ecf2a19 Mon Sep 17 00:00:00 2001
From: Madoura <madouura@gmail.com>
Date: Fri, 4 Nov 2022 11:55:16 -0500
Subject: [PATCH] starfive/visionfive/v1: Make sd-image more flake-friendly

---
 starfive/visionfive/v1/sd-image-installer.nix | 6 ++++--
 starfive/visionfive/v1/sd-image.nix           | 8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/starfive/visionfive/v1/sd-image-installer.nix b/starfive/visionfive/v1/sd-image-installer.nix
index c08ba96..1b32132 100644
--- a/starfive/visionfive/v1/sd-image-installer.nix
+++ b/starfive/visionfive/v1/sd-image-installer.nix
@@ -1,12 +1,14 @@
 # To build, use:
 # nix-build "<nixpkgs/nixos>" -I nixos-config=starfive/visionfive/v1/sd-image-installer.nix -A config.system.build.sdImage
+{ modulesPath, ... }:
+
 {
   imports = [
-    <nixpkgs/nixos/modules/profiles/installation-device.nix>
+    "${modulesPath}/profiles/installation-device.nix"
     ./sd-image.nix
   ];
 
-  # the installation media is also the installation target,
+  # The installation media is also the installation target,
   # so we don't want to provide the installation configuration.nix.
   installer.cloneConfig = false;
 }
diff --git a/starfive/visionfive/v1/sd-image.nix b/starfive/visionfive/v1/sd-image.nix
index 7a8aa81..6b4acfc 100644
--- a/starfive/visionfive/v1/sd-image.nix
+++ b/starfive/visionfive/v1/sd-image.nix
@@ -1,13 +1,13 @@
 # To build, use:
-# nix-build "<nixpkgs}/nixos>" -I nixos-config=starfive/visionfive/v1/sd-image.nix -A config.system.build.sdImage
-{ config, pkgs, ... }:
+# nix-build "<nixpkgs/nixos>" -I nixos-config=starfive/visionfive/v1/sd-image.nix -A config.system.build.sdImage
+{ config, pkgs, modulesPath, ... }:
 
 let
   firmware = pkgs.callPackage ./firmware.nix { };
 in {
   imports = [
-    <nixpkgs/nixos/modules/profiles/base.nix>
-    <nixpkgs/nixos/modules/installer/sd-card/sd-image.nix>
+    "${modulesPath}/profiles/base.nix"
+    "${modulesPath}/installer/sd-card/sd-image.nix"
     ./default.nix
   ];