diff --git a/examples/serve.nix b/examples/serve.nix index cdf364b..f514117 100644 --- a/examples/serve.nix +++ b/examples/serve.nix @@ -16,5 +16,7 @@ let (link "./index.html" "go back") ]) ]; + + site = { "index.html" = index; "ex.html" = ex; }; in -mkServePathScript (mkSitePath { "index.html" = index; "ex.html" = ex; }) +mkServeFromSite site diff --git a/pkgs-lib.nix b/pkgs-lib.nix index a2a9615..00963d7 100644 --- a/pkgs-lib.nix +++ b/pkgs-lib.nix @@ -1,6 +1,7 @@ { utils, pkgs }: -let pkgBin = name: "${pkgs.${name}}/bin/${name}"; in -{ +let + pkgBin = name: "${pkgs.${name}}/bin/${name}"; + mkServePathScript = path: pkgs.writeScriptBin "serve" '' #!${pkgs.stdenv.shell} ${pkgBin "miniserve"} --index index.html ${path} @@ -20,4 +21,9 @@ let pkgBin = name: "${pkgs.${name}}/bin/${name}"; in mkdir -p $out ${concatStringsSep "\n" createFileCmds} ''; +in +{ + inherit mkServePathScript mkSitePath; + + mkServeFromSite = site: mkServePathScript (mkSitePath site); }