'building'

This commit is contained in:
mjallen18
2025-12-26 22:47:11 -06:00
parent c8aebb9e4a
commit f549723a61
6 changed files with 26 additions and 18 deletions

View File

@@ -31,8 +31,8 @@ in
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
i2c-tools i2c-tools
raspberrypi-eeprom raspberrypi-eeprom
raspberrypifw pkgs.${namespace}.raspberrypifw
raspberrypiWirelessFirmware pkgs.${namespace}.raspberryPiWirelessFirmware
raspberrypi-armstubs raspberrypi-armstubs
erofs-utils erofs-utils
fex fex

View File

@@ -24,7 +24,6 @@
"jemalloc" "jemalloc"
"jupiter-fan-control" "jupiter-fan-control"
"libcamera-rpi" "libcamera-rpi"
"libraspberrypi"
"libsecret" "libsecret"
"linux" "linux"
"linuxPackages_cachyos" "linuxPackages_cachyos"
@@ -56,7 +55,6 @@
"qt3d" "qt3d"
"qtdeclarative" "qtdeclarative"
"qtmultimedia" "qtmultimedia"
"raspberrypi-utils"
"ryubing" "ryubing"
"sdl" "sdl"
"sdl2" "sdl2"
@@ -69,12 +67,17 @@
}; };
nixpkgs.overlays = [ 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: { (_self: super: {
${namespace} = super.${namespace} // { "raspberrypi-utils" = super.${namespace}."raspberrypi-utils";
linux-rpi = super.${namespace}.linux-rpi.override { stdenv = super.ccacheStdenv; }; "raspberrypi-udev-rules" = super.${namespace}."udev-rules";
libraspberrypi = super.${namespace}.libraspberrypi.override { stdenv = super.ccacheStdenv; };
raspberrypi-utils = super.${namespace}.raspberrypi-utils.override { stdenv = super.ccacheStdenv; };
};
}) })
(_self: super: { (_self: super: {
"mesa" = super."mesa".override { buildPackages.stdenv = super.ccacheStdenv; }; "mesa" = super."mesa".override { buildPackages.stdenv = super.ccacheStdenv; };

View File

@@ -1,11 +1,13 @@
{ {
lib, lib,
stdenv, ccacheStdenv,
fetchFromGitHub, fetchFromGitHub,
cmake, cmake,
pkg-config, pkg-config,
}: }:
let
stdenv = ccacheStdenv;
in
stdenv.mkDerivation (_finalAttrs: { stdenv.mkDerivation (_finalAttrs: {
pname = "libraspberrypi"; pname = "libraspberrypi";
version = "unstable-2024-12-23"; version = "unstable-2024-12-23";

View File

@@ -1,5 +1,5 @@
{ {
stdenv, ccacheStdenv,
lib, lib,
fetchFromGitHub, fetchFromGitHub,
buildLinux, buildLinux,
@@ -8,6 +8,7 @@
}@args: }@args:
let let
stdenv = ccacheStdenv;
modDirVersion = "6.12.47"; modDirVersion = "6.12.47";
tag = "stable_20250916"; tag = "stable_20250916";
hash = "sha256-HG8Oc04V2t54l0SOn4gKmNJWQUrZfjWusgKcWvx74H0=="; hash = "sha256-HG8Oc04V2t54l0SOn4gKmNJWQUrZfjWusgKcWvx74H0==";

View File

@@ -2,12 +2,14 @@
# because libraspberrypi is outdated and deprecated # because libraspberrypi is outdated and deprecated
{ {
lib, lib,
stdenv, ccacheStdenv,
fetchFromGitHub, fetchFromGitHub,
cmake, cmake,
dtc, dtc,
}: }:
let
stdenv = ccacheStdenv;
in
stdenv.mkDerivation (_finalAttrs: { stdenv.mkDerivation (_finalAttrs: {
pname = "raspberrypi-utils"; pname = "raspberrypi-utils";
version = "unstable-2025-12-26"; version = "unstable-2025-12-26";

View File

@@ -16,10 +16,10 @@
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
environment.systemPackages = with pkgs.${namespace}; [ #environment.systemPackages = with pkgs.${namespace}; [
ubootRaspberryPi5 # ubootRaspberryPi5
ubootTools # ubootTools
]; #];
${namespace} = { ${namespace} = {