From 8999676304dc81bb257ca28737b584b39c506954 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 10 May 2022 08:14:13 +0000
Subject: host/rootfs: make firmware available

---
 host/rootfs/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'host')

diff --git a/host/rootfs/default.nix b/host/rootfs/default.nix
index f40e25d..7ac3d3a 100644
--- a/host/rootfs/default.nix
+++ b/host/rootfs/default.nix
@@ -4,8 +4,8 @@
 { pkgs ? import <nixpkgs> {} }: pkgs.pkgsStatic.callPackage (
 
 { lib, stdenv, runCommand, writeReferencesToFile, s6-rc, tar2ext4
-, busybox, cloud-hypervisor, cryptsetup, execline, jq, kmod, mdevd, s6
-, s6-linux-init, socat, util-linuxMinimal, xorg
+, busybox, cloud-hypervisor, cryptsetup, execline, jq, kmod, linux-firmware
+, mdevd, s6, s6-linux-init, socat, util-linuxMinimal, xorg
 }:
 
 let
@@ -57,14 +57,14 @@ let
   packagesSysroot = runCommand "packages-sysroot" {
     nativeBuildInputs = [ xorg.lndir ];
   } ''
-    mkdir -p $out/usr/bin
+    mkdir -p $out/lib $out/usr/bin
     ln -s ${concatMapStringsSep " " (p: "${p}/bin/*") packages} $out/usr/bin
 
     for pkg in ${lib.escapeShellArgs [ pkgsGui.mesa.drivers pkgsGui.dejavu_fonts ]}; do
         lndir -silent "$pkg" "$out/usr"
     done
 
-    ln -s ${kernel}/lib $out/lib
+    ln -s ${kernel}/lib/modules ${linux-firmware}/lib/firmware $out/lib
 
     # TODO: this is a hack and we should just build the util-linux
     # programs we want.
-- 
cgit 1.4.1