From 20501b5a276492cc71a3952bb0a1ee0e852b3c46 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 9 Nov 2025 15:22:41 +0100
Subject: [PATCH] nixos/lib/make-{single,multi}-disk-zfs-image: fix references
 to kernel modules

Closes #455144

Previously, image builds with ZFS would fail with

    kernel-modules-shrunk> root module: 9p
    kernel-modules-shrunk> modprobe: FATAL: Module 9p not found in directory /nix/store/r4m7bmihmr40377yh33pn76wp9w33da2-kernel-modules/lib/modules/6.12.53

with said store-path only containing out-of-tree modules.

I'm pretty sure this was just missed to update in
f71277d66db862f2cef133e9d63cb858f38d0a0c.
---
 nixos/lib/make-multi-disk-zfs-image.nix  | 1 +
 nixos/lib/make-single-disk-zfs-image.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/nixos/lib/make-multi-disk-zfs-image.nix b/nixos/lib/make-multi-disk-zfs-image.nix
index cbb2fdf7b6c5..55e54b3b2f0d 100644
--- a/nixos/lib/make-multi-disk-zfs-image.nix
+++ b/nixos/lib/make-multi-disk-zfs-image.nix
@@ -126,6 +126,7 @@ let
     with config.boot;
     [
       kernelPackages.kernel
+      (lib.getOutput "modules" kernelPackages.kernel)
       kernelPackages.${pkgs.zfs.kernelModuleAttribute}
     ]
   );
diff --git a/nixos/lib/make-single-disk-zfs-image.nix b/nixos/lib/make-single-disk-zfs-image.nix
index 74cbaaa7edfe..dbd68a768847 100644
--- a/nixos/lib/make-single-disk-zfs-image.nix
+++ b/nixos/lib/make-single-disk-zfs-image.nix
@@ -114,6 +114,7 @@ let
     with config.boot;
     [
       kernelPackages.kernel
+      (lib.getOutput "modules" kernelPackages.kernel)
       kernelPackages.${pkgs.zfs.kernelModuleAttribute}
     ]
   );