diff --git a/flake.nix b/flake.nix index 088e08d..9ed6b9f 100644 --- a/flake.nix +++ b/flake.nix @@ -75,32 +75,30 @@ defaultPackage = packages.angestoepseltSite; devShell = packages.devEnv; - - hydraJobs = { - inherit site; - - container = { site }: let - container = pkgs.dockerTools.buildImage { - name = "angestoepselt-site-container"; - tag = "latest"; - - config = { - Cmd = [ - "${pkgs.caddy}/bin/caddy" - "file-server" - "-root" "${site}" - ]; - }; - }; - in pkgs.runCommand "container" {} '' - mkdir -p $out/nix-support - echo "file none ${container}" > $out/nix-support/hydra-build-products - ''; - }; }); in (base // { hydraJobs = { - inherit (base.packages.x86_64-linux) container; + inherit (base.packages.x86_64-linux) site; + + container = { site }: let + pkgs = import nixpkgs { system = "x86_64-linux"; }; + + container = pkgs.dockerTools.buildImage { + name = "angestoepselt-site-container"; + tag = "latest"; + + config = { + Cmd = [ + "${pkgs.caddy}/bin/caddy" + "file-server" + "-root" "${site}" + ]; + }; + }; + in pkgs.runCommand "container" {} '' + mkdir -p $out/nix-support + echo "file none ${container}" > $out/nix-support/hydra-build-products + ''; }; }); }