Yureka Lilian <yureka@cyberchaos.dev> writes:
diff --git a/vm/sys/net/default.nix b/vm/sys/net/default.nix index b5873eb..10cb382 100644 --- a/vm/sys/net/default.nix +++ b/vm/sys/net/default.nix @@ -1,23 +1,22 @@ # SPDX-License-Identifier: MIT # SPDX-FileCopyrightText: 2021-2023 Alyssa Ross <hi@alyssa.is> +# SPDX-FileCopyrightText: 2025 Yureka Lilian <yureka@cyberchaos.dev>
-import ../../../lib/call-package.nix ({ lseek, src, terminfo, pkgsStatic }: -pkgsStatic.callPackage ( +import ../../../lib/call-package.nix ({ lseek, spectrum-guest-tools, src, terminfo, pkgsMusl }: +pkgsMusl.callPackage (
Switching to non-static really ought to be a separate patch, with rationale explained in the message.
{ lib, stdenvNoCC, nixos, runCommand, writeClosure , erofs-utils, jq, s6-rc, util-linux, xorg -, busybox, connmanMinimal, dbus, execline, kmod, linux_latest, mdevd, nftables -, s6, s6-linux-init +, busybox, dbus, execline, kmod, linux_latest, mdevd +, s6, s6-linux-init, xdp-tools }:
let inherit (lib) concatMapStringsSep; inherit (nixosAllHardware.config.hardware) firmware;
- connman = connmanMinimal; - packages = [ - connman dbus execline kmod mdevd s6 s6-linux-init s6-rc + dbus execline kmod mdevd s6 s6-linux-init s6-rc xdp-tools
(busybox.override { extraConfig = '' @@ -30,13 +29,16 @@ let CONFIG_RMMOD n ''; }) - - (nftables.override { withCli = false; }) ];
# Packages that should be fully linked into /usr, # (not just their bin/* files). - usrPackages = [ connman dbus firmware kernel terminfo ]; + usrPackages = [ + dbus firmware kernel terminfo + + # for xdp-forwarder + spectrum-guest-tools
Shouldn't this be spectrum-driver-tools?
+ ];
packagesSysroot = runCommand "packages-sysroot" { inherit packages;