From 2ef0b00076a122665c7301222d0a50997e2b7e91 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Wed, 27 Nov 2024 12:00:20 -0500 Subject: Attempt to fix build on raspberry pi Signed-off-by: Andrew Opalach --- flake.nix | 8 +++++--- hardware/cmsb-001/configuration.nix | 3 +++ subprojects/libakiyo.wrap | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 454b16a..bcff0de 100644 --- a/flake.nix +++ b/flake.nix @@ -40,7 +40,7 @@ version = "0.01"; src = fetchgit { url = "https://git.akon.city/camu"; - rev = "28f56a9e1324fbde6854c72d6b234c2f00748d03"; + rev = "5f32becb738a4b04f5b8951fdd8a464bf65eba8e"; postFetch = '' export NIX_SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt @@ -58,7 +58,7 @@ find subprojects -type d -name .git -prune -execdir rm -r {} + ''; - sha256 = "INzlYEjiWtib+hHHHaMJqiSDkOUOfSRtsAhJNOgwSyo="; + sha256 = "YT4LN+Z7eU42bquoxBx0NzQwgGuRY+t6PVQzZDW62X8="; }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ @@ -286,7 +286,9 @@ in nixosSystem { system = system; modules = [ - ({ pkgs, ... }: { nixpkgs.overlays = [ ]; }) + ({ pkgs, ... }: { nixpkgs.overlays = [ + (self: super: { camu = packages.${system}.default; }) + ];}) nixos-hardware.nixosModules.raspberry-pi-3 ./hardware/cmsb-001/configuration.nix ]; diff --git a/hardware/cmsb-001/configuration.nix b/hardware/cmsb-001/configuration.nix index 4011a72..7eb6484 100644 --- a/hardware/cmsb-001/configuration.nix +++ b/hardware/cmsb-001/configuration.nix @@ -116,7 +116,10 @@ }) mesa-demos vulkan-tools + cage + nfs-utils mpv + camu ]; # https://pablo.tools/blog/computers/nixos-generate-raspberry-images/ diff --git a/subprojects/libakiyo.wrap b/subprojects/libakiyo.wrap index 002abff..e6a8bd2 100644 --- a/subprojects/libakiyo.wrap +++ b/subprojects/libakiyo.wrap @@ -1,4 +1,4 @@ [wrap-git] url = https://git.akon.city/libakiyo -revision = 62b75446102ca32b23a78188b0aca8fe31d8b2c0 +revision = 4b39609a3263bf97b217daae653630e09021b502 depth = 1 -- cgit v1.2.3-101-g0448