From 3dd36f1c7222c2559fbf9939ae371f9ee34dd318 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Mon, 29 Dec 2025 17:49:16 -0700
Subject: [PATCH] add nvidia deps to nonfree

---
 build/dpkg-deps/depends         |  1 +
 build/dpkg-deps/generate.sh     |  3 +++
 build/dpkg-deps/nonfree.depends | 11 +++++++++++
 build/dpkg-deps/nvidia.depends  |  4 ----
 build/image-recipe/build.sh     |  6 +-----
 5 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 build/dpkg-deps/nonfree.depends
 delete mode 100644 build/dpkg-deps/nvidia.depends

diff --git a/build/dpkg-deps/depends b/build/dpkg-deps/depends
index 00625f41b..50266ec71 100644
--- a/build/dpkg-deps/depends
+++ b/build/dpkg-deps/depends
@@ -3,6 +3,7 @@ avahi-utils
 b3sum
 bash-completion
 beep
+binfmt-support
 bmon
 btrfs-progs
 ca-certificates
diff --git a/build/dpkg-deps/generate.sh b/build/dpkg-deps/generate.sh
index 7f1c2dcae..ffb80dce3 100755
--- a/build/dpkg-deps/generate.sh
+++ b/build/dpkg-deps/generate.sh
@@ -9,6 +9,9 @@ FEATURES+=("${ARCH}")
 if [ "$ARCH" != "$PLATFORM" ]; then
     FEATURES+=("${PLATFORM}")
 fi
+if [[ "$PLATFORM" =~ -nonfree$ ]]; then
+    FEATURES+=("nonfree")
+fi
 
 feature_file_checker='
 /^#/ { next }
diff --git a/build/dpkg-deps/nonfree.depends b/build/dpkg-deps/nonfree.depends
new file mode 100644
index 000000000..0662c811e
--- /dev/null
+++ b/build/dpkg-deps/nonfree.depends
@@ -0,0 +1,11 @@
++ firmware-amd-graphics
++ firmware-atheros
++ firmware-brcm80211
++ firmware-iwlwifi
++ firmware-libertas
++ firmware-misc-nonfree
++ firmware-realtek
++ libnvidia-container-tools
++ libnvidia-container1
++ nvidia-container-toolkit
++ nvidia-driver
\ No newline at end of file
diff --git a/build/dpkg-deps/nvidia.depends b/build/dpkg-deps/nvidia.depends
deleted file mode 100644
index 88f5b736c..000000000
--- a/build/dpkg-deps/nvidia.depends
+++ /dev/null
@@ -1,4 +0,0 @@
-libnvidia-container-tools
-libnvidia-container1
-nvidia-container-toolkit
-nvidia-driver
\ No newline at end of file
diff --git a/build/image-recipe/build.sh b/build/image-recipe/build.sh
index 12552847b..443520ce6 100755
--- a/build/image-recipe/build.sh
+++ b/build/image-recipe/build.sh
@@ -73,7 +73,7 @@ if [ "$NON_FREE" = 1 ]; then
 	if [ "$IB_SUITE" = "bullseye" ]; then
 		ARCHIVE_AREAS="$ARCHIVE_AREAS non-free"
 	else
-		ARCHIVE_AREAS="$ARCHIVE_AREAS non-free-firmware"
+		ARCHIVE_AREAS="$ARCHIVE_AREAS non-free non-free-firmware"
 	fi
 fi
 
@@ -187,10 +187,6 @@ EOF
 # Dependencies
 
 ## Firmware
-if [ "$NON_FREE" = 1 ]; then
-	echo 'firmware-iwlwifi firmware-misc-nonfree firmware-brcm80211 firmware-realtek firmware-atheros firmware-libertas firmware-amd-graphics' > config/package-lists/nonfree.list.chroot
-fi
-
 cat > config/hooks/normal/9000-install-startos.hook.chroot << EOF
 #!/bin/bash