The module should work regardless of system

This commit is contained in:
Sebastian 2024-02-11 17:54:29 +01:00
parent 11d1ac6dae
commit c3fb88e4ce
2 changed files with 14 additions and 12 deletions

View File

@ -6,16 +6,18 @@
nixpkgs.url = "github:NixOS/nixpkgs/23.11";
};
outputs = { self, nixpkgs, flake-utils }:
flake-utils.lib.eachSystem [ "x86_64-linux" "aarch64-linux" ] (system:
let
pkgs = nixpkgs.legacyPackages.${system};
in
{
nixosModules.default = { config, pkgs, ... }: {
imports = [ ./stanogs-client-module.nix ];
};
flake-utils.lib.eachSystem [ "x86_64-linux" "aarch64-linux" ]
(system:
let
pkgs = nixpkgs.legacyPackages.${system};
in
{
formatter = pkgs.nixpkgs-fmt;
}
) // {
nixosModules.default = { config, pkgs, ... }: {
imports = [ ./satnogs-client-docker-module.nix ];
};
formatter = pkgs.nixpkgs-fmt;
}
);
};
}

View File

@ -142,7 +142,7 @@ in
SATNOGS_STATION_LAT = cfg.satnogs-station-lat;
SATNOGS_STATION_LON = cfg.satnogs-station-lon;
})
++ map (f: "--env-file ${escapeShellArg f}") container.environmentFiles
++ map (f: "--env-file ${escapeShellArg f}") cfg.additional-env-files
++ [ "up" ]);
preStop = "${pkgs.docker-compose}/bin/docker-compose -f ${./satnogs-docker-compose.yml} down";