diff --git a/modules/outputs/initramfs.nix b/modules/outputs/initramfs.nix index 6d5d473..d7ad491 100644 --- a/modules/outputs/initramfs.nix +++ b/modules/outputs/initramfs.nix @@ -75,7 +75,7 @@ in mv out $out ''; systemConfiguration = - pkgs.systemconfig config.filesystem.contents; + pkgs.systemconfig config.filesystem.contents config.hostname; }; }; } diff --git a/pkgs/levitate/default.nix b/pkgs/levitate/default.nix index 5a2e9c5..17c02f1 100644 --- a/pkgs/levitate/default.nix +++ b/pkgs/levitate/default.nix @@ -74,7 +74,7 @@ let ../../modules/s6 ]; }; - in systemconfig eval.config.filesystem.contents; + in systemconfig eval.config.filesystem.contents eval.config.hostname; in writeScriptBin "levitate" '' #!/bin/sh destdir=${newRoot} diff --git a/pkgs/systemconfig/default.nix b/pkgs/systemconfig/default.nix index f6a6f9d..4766fea 100644 --- a/pkgs/systemconfig/default.nix +++ b/pkgs/systemconfig/default.nix @@ -62,10 +62,10 @@ let ${(builtins.concatStringsSep "\n" (visit "." attrset))} } ''; -in attrset: +in attrset: hostname: let makedevs = activateScript attrset; in stdenv.mkDerivation { - name="make-stuff"; + name="${hostname}-system-configuration"; src = ./.; CFLAGS = "-Os";