From f5f4d6e8e37e9866950e186f52bc57399114bbb4 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 24 Mar 2025 13:42:31 +0000
Subject: [PATCH] =?UTF-8?q?nixos/installation-device:=20don=E2=80=99t=20in?=
 =?UTF-8?q?clude=20`stdenv`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A basic NixOS system shouldn’t require `stdenv` to install, and
it adds something like 45 MiB of build tools to the installer
closure. This doesn’t really help much at present since
WebKitGTK(?!) has a dodgy reference to GCC, but it’s a step in the
right direction.
---
 nixos/modules/profiles/installation-device.nix | 3 +--
 nixos/tests/installer.nix                      | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix
index 3a29f7ab8c90..0b25dd5af8e9 100644
--- a/nixos/modules/profiles/installation-device.nix
+++ b/nixos/modules/profiles/installation-device.nix
@@ -107,11 +107,10 @@ with lib;
     boot.kernel.sysctl."vm.overcommit_memory" = "1";
 
     # To speed up installation a little bit, include the complete
-    # stdenv in the Nix store on the CD.
+    # stdenvNoCC in the Nix store on the CD.
     system.extraDependencies =
       with pkgs;
       [
-        stdenv
         stdenvNoCC # for runCommand
         busybox
         # For boot.initrd.systemd
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 56f1b4f19bfb..010a3e97aba3 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -709,6 +709,10 @@ let
               system.extraDependencies =
                 with pkgs;
                 [
+                  # TODO: Remove this when we can install systems
+                  # without `stdenv`.
+                  stdenv
+
                   bintools
                   brotli
                   brotli.dev