From c8ff8b1f25345e6437c33a708927e430da37dba3 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Fri, 18 Sep 2026 12:33:33 -0400 Subject: [PATCH] simpler derivation --- modules/host.nix | 71 ++++++++++-------------------------------------- 1 file changed, 14 insertions(+), 57 deletions(-) diff --git a/modules/host.nix b/modules/host.nix index cd78f7a..8d77f06 100644 --- a/modules/host.nix +++ b/modules/host.nix @@ -958,63 +958,20 @@ in # Single consolidated CLI: `hermenix vm *` controls the VM, # `hermenix ctl *` drives Hermes inside it. Per-host values are - # passed as env vars via makeWrapperArgs --set. - (pkgs.writers.writeNuBin "hermenix" - { - makeWrapperArgs = [ - "--prefix" - "PATH" - ":" - (lib.makeBinPath ( - with pkgs; - [ - openssh - socat - coreutils - gnutar - gnused - btrfs-progs - util-linux - restic - vim - nix - ] - )) - "--set" - "HERMES_VSOCK_CID" - (toString cfg.vsockCid) - "--set" - "HERMES_GUEST_NAME" - cfg.name - "--set" - "HERMES_DISK_BASE_DIR" - cfg.disk.baseDir - "--set" - "HERMES_HOME_DIR" - cfg.hermesHome - "--set" - "HERMES_GATEWAY_UNIT" - cfg.gatewayUnit - "--set" - "HERMENIX_VERSION" - cfg.version - ]; - } - ( - builtins.concatStringsSep "\n" ( - map builtins.readFile [ - ../nu/lib/common.nu - ../nu/lib/guest.nu - ../nu/host/setup.nu - ../nu/host/migrate.nu - ../nu/host/remote.nu - ../nu/vm/vm.nu - ../nu/ctl/ctl.nu - ../nu/hermenix.nu - ] - ) - ) - ) + # added on top of the base package via makeWrapper. + (pkgs.symlinkJoin { + name = "hermenix"; + paths = [ pkgs.hermenix ]; + nativeBuildInputs = [ pkgs.makeWrapper ]; + postBuild = '' + wrapProgram $out/bin/hermenix \ + --set HERMES_VSOCK_CID ${toString cfg.vsockCid} \ + --set HERMES_GUEST_NAME ${cfg.name} \ + --set HERMES_DISK_BASE_DIR ${cfg.disk.baseDir} \ + --set HERMES_HOME_DIR ${cfg.hermesHome} \ + --set HERMES_GATEWAY_UNIT ${cfg.gatewayUnit} + ''; + }) ]; }; }