From f549723a61aa59c8c328f5f7f6ad7c21e8f2d4c4 Mon Sep 17 00:00:00 2001
From: mjallen18 <matt.l.jallen@gmail.com>
Date: Fri, 26 Dec 2025 22:47:11 -0600
Subject: [PATCH] 'building'

---
 modules/nixos/hardware/raspberry-pi/default.nix |  4 ++--
 modules/nixos/nix/default.nix                   | 17 ++++++++++-------
 packages/raspberrypi/libraspberrypi/default.nix |  6 ++++--
 packages/raspberrypi/linux-rpi/default.nix      |  3 ++-
 .../raspberrypi/raspberrypi-utils/default.nix   |  6 ++++--
 systems/aarch64-linux/pi5/default.nix           |  8 ++++----
 6 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/modules/nixos/hardware/raspberry-pi/default.nix b/modules/nixos/hardware/raspberry-pi/default.nix
index 37d4c34..85e0d67 100644
--- a/modules/nixos/hardware/raspberry-pi/default.nix
+++ b/modules/nixos/hardware/raspberry-pi/default.nix
@@ -31,8 +31,8 @@ in
     environment.systemPackages = with pkgs; [
       i2c-tools
       raspberrypi-eeprom
-      raspberrypifw
-      raspberrypiWirelessFirmware
+      pkgs.${namespace}.raspberrypifw
+      pkgs.${namespace}.raspberryPiWirelessFirmware
       raspberrypi-armstubs
       erofs-utils
       fex
diff --git a/modules/nixos/nix/default.nix b/modules/nixos/nix/default.nix
index 0ae4d93..cbd374a 100644
--- a/modules/nixos/nix/default.nix
+++ b/modules/nixos/nix/default.nix
@@ -24,7 +24,6 @@
       "jemalloc"
       "jupiter-fan-control"
       "libcamera-rpi"
-      "libraspberrypi"
       "libsecret"
       "linux"
       "linuxPackages_cachyos"
@@ -56,7 +55,6 @@
       "qt3d"
       "qtdeclarative"
       "qtmultimedia"
-      "raspberrypi-utils"
       "ryubing"
       "sdl"
       "sdl2"
@@ -69,12 +67,17 @@
   };
 
   nixpkgs.overlays = [
+    #(_self: super: {
+    #    ${namespace} = super.${namespace} // {
+    #      linux-rpi = super.${namespace}.linux-rpi.override { stdenv = super.ccacheStdenv; };
+    #      libraspberrypi = super.${namespace}.libraspberrypi.override { stdenv = super.ccacheStdenv; };
+    #      raspberrypi-utils = super.${namespace}.raspberrypi-utils.override { stdenv = super.ccacheStdenv; };
+    #    };
+    #})
+    
     (_self: super: {
-        ${namespace} = super.${namespace} // {
-          linux-rpi = super.${namespace}.linux-rpi.override { stdenv = super.ccacheStdenv; };
-          libraspberrypi = super.${namespace}.libraspberrypi.override { stdenv = super.ccacheStdenv; };
-          raspberrypi-utils = super.${namespace}.raspberrypi-utils.override { stdenv = super.ccacheStdenv; };
-        };
+      "raspberrypi-utils" = super.${namespace}."raspberrypi-utils";
+      "raspberrypi-udev-rules" = super.${namespace}."udev-rules";
     })
     (_self: super: {
       "mesa" = super."mesa".override { buildPackages.stdenv = super.ccacheStdenv; };
diff --git a/packages/raspberrypi/libraspberrypi/default.nix b/packages/raspberrypi/libraspberrypi/default.nix
index ef52d59..09d1eb2 100644
--- a/packages/raspberrypi/libraspberrypi/default.nix
+++ b/packages/raspberrypi/libraspberrypi/default.nix
@@ -1,11 +1,13 @@
 {
   lib,
-  stdenv,
+  ccacheStdenv,
   fetchFromGitHub,
   cmake,
   pkg-config,
 }:
-
+let
+  stdenv = ccacheStdenv;
+in
 stdenv.mkDerivation (_finalAttrs: {
   pname = "libraspberrypi";
   version = "unstable-2024-12-23";
diff --git a/packages/raspberrypi/linux-rpi/default.nix b/packages/raspberrypi/linux-rpi/default.nix
index f6ebd46..c1e4c10 100644
--- a/packages/raspberrypi/linux-rpi/default.nix
+++ b/packages/raspberrypi/linux-rpi/default.nix
@@ -1,5 +1,5 @@
 {
-  stdenv,
+  ccacheStdenv,
   lib,
   fetchFromGitHub,
   buildLinux,
@@ -8,6 +8,7 @@
 }@args:
 
 let
+  stdenv = ccacheStdenv;
   modDirVersion = "6.12.47";
   tag = "stable_20250916";
   hash = "sha256-HG8Oc04V2t54l0SOn4gKmNJWQUrZfjWusgKcWvx74H0==";
diff --git a/packages/raspberrypi/raspberrypi-utils/default.nix b/packages/raspberrypi/raspberrypi-utils/default.nix
index 0c533b3..a5b72d5 100644
--- a/packages/raspberrypi/raspberrypi-utils/default.nix
+++ b/packages/raspberrypi/raspberrypi-utils/default.nix
@@ -2,12 +2,14 @@
 # because libraspberrypi is outdated and deprecated
 {
   lib,
-  stdenv,
+  ccacheStdenv,
   fetchFromGitHub,
   cmake,
   dtc,
 }:
-
+let
+  stdenv = ccacheStdenv;
+in
 stdenv.mkDerivation (_finalAttrs: {
   pname = "raspberrypi-utils";
   version = "unstable-2025-12-26";
diff --git a/systems/aarch64-linux/pi5/default.nix b/systems/aarch64-linux/pi5/default.nix
index 1acfbb2..4934da5 100644
--- a/systems/aarch64-linux/pi5/default.nix
+++ b/systems/aarch64-linux/pi5/default.nix
@@ -16,10 +16,10 @@
 
   virtualisation.docker.enable = true;
 
-  environment.systemPackages = with pkgs.${namespace}; [
-    ubootRaspberryPi5
-    ubootTools
-  ];
+  #environment.systemPackages = with pkgs.${namespace}; [
+  #  ubootRaspberryPi5
+  #  ubootTools
+  #];
 
   ${namespace} = {