This commit is contained in:
mjallen18
2025-12-29 19:43:26 -06:00
parent ae95786d8e
commit ede0bf5c10
2 changed files with 22 additions and 20 deletions

View File

@@ -151,7 +151,7 @@ in
}; };
# Pi specific system tags # Pi specific system tags
system.nixos.tags =[ system.nixos.tags = [
"raspberry-pi-${cfg.variant}" "raspberry-pi-${cfg.variant}"
# config.boot.loader.raspberry-pi.bootloader # config.boot.loader.raspberry-pi.bootloader
config.boot.kernelPackages.kernel.version config.boot.kernelPackages.kernel.version

View File

@@ -27,22 +27,8 @@ in
"jemalloc" "jemalloc"
"jupiter-fan-control" "jupiter-fan-control"
"libcamera-rpi" "libcamera-rpi"
"${namespace}.libraspberrypi" # "libsecret"
"libsecret"
"linux" "linux"
"${namespace}.linux-rpi"
"${namespace}.linuxPackages_cachyos"
"${namespace}.linuxPackages_cachyos-lto"
"${namespace}.linuxPackages_cachyos-lto-znver4"
"${namespace}.linuxPackages_cachyos-server"
"${namespace}.linuxPackages_cachyos-server-lto"
"${namespace}.linuxPackages_cachyos-server-lto-znver4"
"${namespace}.linuxPackages_cachyos-rc"
"${namespace}.linuxPackages_cachyos-rc-lto"
"${namespace}.linuxPackages_cachyos-rc-lto-znver4"
"${namespace}.linuxPackages_cachyos-hardened"
"${namespace}.linuxPackages_cachyos-hardened-lto"
"${namespace}.linuxPackages_cachyos-hardened-lto-znver4"
"mesa" "mesa"
"mesa_i686" "mesa_i686"
"mesa-radeonsi-jupiter" "mesa-radeonsi-jupiter"
@@ -60,12 +46,11 @@ in
"qt3d" "qt3d"
"qtdeclarative" "qtdeclarative"
"qtmultimedia" "qtmultimedia"
"${namespace}.raspberrypi-utils"
"ryubing" "ryubing"
"sdl" "sdl"
"sdl2" "sdl2"
"sdl3" "sdl3"
"uv" # "uv"
"webkitgtk" "webkitgtk"
]; ];
cacheDir = "/var/cache/ccache"; # default location cacheDir = "/var/cache/ccache"; # default location
@@ -74,8 +59,23 @@ in
nixpkgs.overlays = [ nixpkgs.overlays = [
(_self: super: { (_self: super: {
${namespace} = super.${namespace} // { ${namespace} = super.${namespace} // {
linuxPackages_rpi5 = super.linuxPackagesFor (super.${namespace}.linux-rpi.override { stdenv = super.ccacheStdenv; }); linuxPackages_rpi5 = super.linuxPackagesFor (super.${namespace}.linux-rpi.override { stdenv = super.ccacheStdenv; });
linuxPackages_rpi4 = super.linuxPackagesFor (super.${namespace}.linux-rpi.override { stdenv = super.ccacheStdenv; rpiVersion = 4; }); linuxPackages_rpi4 = super.linuxPackagesFor (super.${namespace}.linux-rpi.override { stdenv = super.ccacheStdenv; rpiVersion = 4; });
libraspberrypi = super.${namespace}.libraspberrypi.override { stdenv = super.ccacheStdenv; };
raspberrypi-utils = super.${namespace}.raspberrypi-utils.override { stdenv = super.ccacheStdenv; };
linuxPackages_cachyos = super.${namespace}.linuxPackages_cachyos.override { stdenv = super.ccacheStdenv; };
linuxPackages_cachyos-lto = super.${namespace}.linuxPackages_cachyos-lto.override { stdenv = super.ccacheStdenv; };
linuxPackages_cachyos-lto-znver4 = super.${namespace}.linuxPackages_cachyos-lto-znver4.override { stdenv = super.ccacheStdenv; };
linuxPackages_cachyos-server = super.${namespace}.linuxPackages_cachyos-server.override { stdenv = super.ccacheStdenv; };
linuxPackages_cachyos-server-lto = super.${namespace}.linuxPackages_cachyos-server-lto.override { stdenv = super.ccacheStdenv; };
linuxPackages_cachyos-server-lto-znver4 = super.${namespace}.linuxPackages_cachyos-server-lto-znver4.override { stdenv = super.ccacheStdenv; };
linuxPackages_cachyos-rc = super.${namespace}.linuxPackages_cachyos-rc.override { stdenv = super.ccacheStdenv; };
linuxPackages_cachyos-rc-lto = super.${namespace}.linuxPackages_cachyos-rc-lto-.override { stdenv = super.ccacheStdenv; };
linuxPackages_cachyos-rc-lto-znver4 = super.${namespace}.linuxPackages_cachyos-rc-lto-znver4.override { stdenv = super.ccacheStdenv; };
linuxPackages_cachyos-hardened = super.${namespace}.linuxPackages_cachyos-hardened.override { stdenv = super.ccacheStdenv; };
linuxPackages_cachyos-hardened-lto = super.${namespace}.linuxPackages_cachyos-hardened-lto.override { stdenv = super.ccacheStdenv; };
linuxPackages_cachyos-hardened-lto-znver4 = super.${namespace}.linuxPackages_cachyos-hardened-lto-znver4.override { stdenv = super.ccacheStdenv; };
}; };
}) })
@@ -112,6 +112,8 @@ in
# todo: make these work # todo: make these work
(_self: super: { (_self: super: {
rocmPackages = super.stable.rocmPackages; rocmPackages = super.stable.rocmPackages;
uv = super.stable.uv;
libsecret = super.stable.libsecret;
piper-tts = super.stable.piper-tts; piper-tts = super.stable.piper-tts;
python3Packages = super.python3Packages // { python3Packages = super.python3Packages // {
torch = super.stable.python3Packages.torch; torch = super.stable.python3Packages.torch;