gortium/infra
1
1
Fork 0
Code Issues 13 Pull Requests 24 Actions Packages Projects 1 Releases Wiki Activity

its time to merge to master... its too big now xD #76

Open
gortium wants to merge 160 commits from uconsole-cm5-incremental into master
pull from: uconsole-cm5-incremental
merge into: gortium:master
Conversation 0 Commits 160 Files Changed 26 +497 -52
10 changed files with 497 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6a1c26cac2 - Show all commits

20
flake.nix
View File

@@ -101,9 +101,20 @@
boot.loader.raspberry-pi.bootloader = "kernel";
# Kill camera packages — not needed on uConsole, break cross-compile
nixpkgs.overlays = [
# Make camera packages "unavailable" so no pkgs depend on them
(final: prev: {
libcamera = prev.libcamera.overrideAttrs (_: { meta.platforms = []; });
libcamera-rpi = prev.libcamera-rpi.overrideAttrs (_: { meta.platforms = []; });
libpisp = prev.libpisp.overrideAttrs (_: { meta.platforms = []; });
# Pipewire in nixos-25.11 has libcamera unconditionally in buildInputs;
# meta.platforms trick doesn't help — must actually remove it
pipewire = prev.pipewire.overrideAttrs (old: {
mesonFlags = old.mesonFlags ++ [ "-Dlibcamera=disabled" ];
buildInputs = builtins.filter
(x: !(x?pname && x.pname == "libcamera"))
(old.buildInputs or []);
mesonFlags = builtins.filter
(flag: !(builtins.isString flag && builtins.match ".*libcamera.*" flag != null))
(old.mesonFlags or []) ++ [ "-Dlibcamera=disabled" ];
});
})
];
@@ -114,7 +125,12 @@
nixpkgs.overlays = [
(final: prev: {
pipewire = prev.pipewire.overrideAttrs (old: {
mesonFlags = old.mesonFlags ++ [ "-Dlibcamera=disabled" ];
buildInputs = builtins.filter
(x: !(x?pname && x.pname == "libcamera"))
(old.buildInputs or []);
mesonFlags = builtins.filter
(flag: !(builtins.isString flag && builtins.match ".*libcamera.*" flag != null))
(old.mesonFlags or []) ++ [ "-Dlibcamera=disabled" ];
});
})
];