uConsole: remove clamav (cross-compile failure — cmake try_run + Rust proc-macro linker)
This commit is contained in:
22
flake.nix
22
flake.nix
@@ -116,6 +116,12 @@
|
|||||||
# during codegen (preload_nlua.lua). No clean override option.
|
# during codegen (preload_nlua.lua). No clean override option.
|
||||||
# Fix: remove from system packages + install via native build
|
# Fix: remove from system packages + install via native build
|
||||||
# once uConsole is set up as remote builder.
|
# once uConsole is set up as remote builder.
|
||||||
|
#
|
||||||
|
# clamav:
|
||||||
|
# cmake try_run() + Rust proc-macro can't find native linker in
|
||||||
|
# cross-compile (cc crate uses cross CC, no cc in PATH for build
|
||||||
|
# scripts). Chain: clamav → system-path → etc → dbus → polkit.
|
||||||
|
# Fix: remove from system packages; clamscan available from server.
|
||||||
|
|
||||||
#
|
#
|
||||||
# ==== Remote builder setup (bidirectional) — TODO ====
|
# ==== Remote builder setup (bidirectional) — TODO ====
|
||||||
@@ -184,21 +190,7 @@
|
|||||||
(x: x?pname && x.pname != "perl-ldap")
|
(x: x?pname && x.pname != "perl-ldap")
|
||||||
(old.propagatedBuildInputs or []);
|
(old.propagatedBuildInputs or []);
|
||||||
});
|
});
|
||||||
# clamav try_run fails cross-compile (cmake modules all use the same
|
# clamav: removed from system packages (see note above).
|
||||||
# generic `test_run_result` cache variable name for FD passing, uname
|
|
||||||
# POSIX, struct packing, and signed right-shift checks).
|
|
||||||
# On aarch64 Linux (glibc + GCC) all four return 0, so pre-set it.
|
|
||||||
clamav = prev.clamav.overrideAttrs (old: {
|
|
||||||
cmakeFlags = (old.cmakeFlags or []) ++ [
|
|
||||||
"-Dtest_run_result=0"
|
|
||||||
"-Dtest_run_result__TRYRUN_OUTPUT="
|
|
||||||
];
|
|
||||||
# Give cargo access to a native C compiler for Rust build script
|
|
||||||
# compilations (proc-macros run on the BUILD host, not the target).
|
|
||||||
nativeBuildInputs = (old.nativeBuildInputs or []) ++ [
|
|
||||||
prev.buildPackages.gcc
|
|
||||||
];
|
|
||||||
});
|
|
||||||
};
|
};
|
||||||
|
|
||||||
uconsoleRpiPipewireOverlay = final: prev: {
|
uconsoleRpiPipewireOverlay = final: prev: {
|
||||||
|
|||||||
@@ -197,12 +197,11 @@
|
|||||||
|
|
||||||
# Enable remote builder (distributed build via lazyworkhorse server)
|
# Enable remote builder (distributed build via lazyworkhorse server)
|
||||||
services.remoteBuilder.enable = true;
|
services.remoteBuilder.enable = true;
|
||||||
# ============================================================
|
# ClamAV REMOVED — cross-compile failure (try_run + Rust linker)
|
||||||
# ClamAV antivirus — daily automatic scans
|
# clamscan available from server when needed.
|
||||||
# ============================================================
|
# gortium.clamav = {
|
||||||
gortium.clamav = {
|
# enable = true;
|
||||||
enable = true;
|
# enableDaemon = false;
|
||||||
enableDaemon = false;
|
# };
|
||||||
};
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user