From 193f4fea90a1b26d7bbf8d04b60f6522e830dd65 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sat, 10 Jun 2023 16:37:58 +0200
Subject: [PATCH] nixos/activatable-system: Make substitutions explicit

This helps with understanding the code.
We might make this not depend on environment variables later.
systemBuilderArgs is a form of global state, which isn't helpful.
---
 .../system/activation/activatable-system.nix       | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/activation/activatable-system.nix b/nixos/modules/system/activation/activatable-system.nix
index 656049053f15..1fbcd6dca6da 100644
--- a/nixos/modules/system/activation/activatable-system.nix
+++ b/nixos/modules/system/activation/activatable-system.nix
@@ -34,7 +34,19 @@ in
       unset activationScript dryActivationScript
 
       mkdir $out/bin
-      substituteAll ${./switch-to-configuration.pl} $out/bin/switch-to-configuration
+      substitute ${./switch-to-configuration.pl} $out/bin/switch-to-configuration \
+        --subst-var coreutils \
+        --subst-var distroId \
+        --subst-var installBootLoader \
+        --subst-var localeArchive \
+        --subst-var out \
+        --subst-var perl \
+        --subst-var shell \
+        --subst-var su \
+        --subst-var systemd \
+        --subst-var utillinux \
+        ;
+
       chmod +x $out/bin/switch-to-configuration
       ${optionalString (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) ''
         if ! output=$($perl/bin/perl -c $out/bin/switch-to-configuration 2>&1); then