Add support for environment.systemPackages.

This commit is contained in:
r-vdp 2023-06-09 15:27:12 +02:00
parent c02d43aa97
commit d5f138f939
No known key found for this signature in database
5 changed files with 115 additions and 39 deletions

View file

@ -284,6 +284,13 @@ in
cp ${resultImg} $out
'';
mkTestPreamble = node: action: ''
${node}.succeed("/system-manager-profile/bin/${action} 2>&1 | tee /tmp/output.log")
${node}.succeed("grep -vF 'ERROR' /tmp/output.log")
'';
activateProfileSnippet = node: self.lib.mkTestPreamble node "activate";
make-vm-test =
name:
{ system

View file

@ -6,6 +6,7 @@
}:
{
imports = [
./environment.nix
./etc.nix
./systemd.nix
./upstream/nixpkgs
@ -16,7 +17,6 @@
inherit (lib) types;
in
{
nixpkgs = {
# TODO: switch to lib.systems.parsedPlatform
hostPlatform = lib.mkOption {

View file

@ -0,0 +1,17 @@
{ lib, config, pkgs, ... }:
{
options.environment = {
systemPackages = lib.mkOption {
type = lib.types.listOf lib.types.package;
default = [ ];
};
};
config = {
environment.etc."profile.d/system-manager-path.sh".source =
pkgs.writeShellScript "system-manager-path.sh" ''
export PATH=${lib.makeBinPath config.environment.systemPackages}:''${PATH}
'';
};
}