From d9e6ea7a82e0239edc6884b7a759a2c5607e8dbc Mon Sep 17 00:00:00 2001
From: Matt Schreiber <schreibah@gmail.com>
Date: Sun, 20 Nov 2022 09:40:46 -0500
Subject: [PATCH 1/2] fix(nix): match current flake output schema

by adding `packages.<system>.default` and `devShells.<system>.default`,
which are used in the current flake output schema in place of,
respectively,  `defaultPackage.<system>` and `devShell.<system>`.

Retain `defaultPackage.<system>` and `devShell.<system>` for
compatibility with older Nix clients, but make them aliases for the
newer output schema attributes.
---
 flake.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/flake.nix b/flake.nix
index ed1d8665..2469dc3a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,7 +32,8 @@
     in {
       packages = perSystem (system:
         let
-          resume = buildResumeFor system;
+          pkgs = pkgsFor system;
+          resume = pkgs.pandocResume.buildResume { inDir = "${self}/markdown"; };
         in
         {
           inherit resume;

From 5b1f38367ddf7cac90e85b29ebf936278028cd57 Mon Sep 17 00:00:00 2001
From: Matt Schreiber <schreibah@gmail.com>
Date: Sun, 20 Nov 2022 09:55:40 -0500
Subject: [PATCH 2/2] feat(nix): expose `buildResume` function

via a new `overlays` output.  This function is used for building resumes
stored in arbitrary locations.
---
 README.md | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 flake.nix | 45 +++++++++++++++++++++++++++--------
 2 files changed, 105 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index d5806a21..f4cfdf8d 100644
--- a/README.md
+++ b/README.md
@@ -80,6 +80,76 @@ nix build
 
 The built resume will end up in `./result`.
 
+Additionally, this project's flake overlay output exposes the function
+`pandocResume.buildResume` for building a resume stored somewhere other than
+[the default location](#instructions):
+
+```nix
+{
+  description = "Flake for building my resume";
+
+  inputs = { pandoc_resume.url = "github:mszep/pandoc_resume"; };
+
+  outputs = { self, nixpkgs, pandoc_resume }:
+    {
+      packages.x86_64-linux =
+        let
+          pkgs = import nixpkgs { system = "x86_64-linux"; overlays = [ pandoc_resume.overlays.pandocResume ]; };
+
+          myResume = pkgs.pandocResume.buildResume {
+            # Mandatory.
+            #
+            # Must specify a directory containing a resume whose basename
+            # includes the extension `.md`.
+            inDir = "${self}/my-resume";
+
+            # Optional.
+            #
+            # The specified directory must contain the files `<style>.css` and
+            # `<style>.tex` for each supported style `<style>`.
+            #
+            # Defaults to "${pandoc_resume}/styles".
+            stylesDir = "${self}/my-styles";
+
+            # Optional.
+            #
+            # Given "my-style", `stylesDir` must contain `my-style.css` and
+            # `my-style.tex`.
+            #
+            # Defaults to "chmduquesne".
+            style = "my-style";
+          };
+        in
+        {
+          inherit myResume;
+          default = myResume;
+        };
+    };
+}
+```
+
+In the example above, you can build your resume by running the following from
+your flake's top-level directory (assuming you are on an `x86_64-linux`
+system):
+
+```
+nix build
+```
+
+Or, equivalently:
+
+```
+nix build '.#myResume'
+```
+
+Or via any valid [flake reference](https://nixos.org/manual/nix/stable/command-ref/new-cli/nix3-flake.html#flake-references).
+For instance, if the flake containing your resume is hosted at
+`https://my.git.host/my-flake`, you can build it with:
+
+```
+nix build 'git+https://my.git.host/my-flake#myResume'
+```
+
 ### Troubleshooting
 
 #### Get versions
diff --git a/flake.nix b/flake.nix
index 2469dc3a..7c4102a4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,18 +18,43 @@
           ];
         in nixpkgs.lib.subtractLists unsupportedSystems nixpkgs.lib.systems.flakeExposed;
 
+      overlay = final: prev: {
+        pandocResume.buildResume =
+          {
+            inDir
+          , stylesDir ? null
+          , style ? null
+          }@args: let
+            overrides = prev.lib.filterAttrs (_: value: value != null) args;
+
+            arg2env = {
+              inDir = "IN_DIR";
+              stylesDir = "STYLES_DIR";
+              style = "STYLE";
+            };
+
+            env =
+              let
+                quoteIfNecessary = value: if builtins.isPath value then value else prev.lib.escapeShellArg value;
+                assign = name: "${arg2env.${name}}=${quoteIfNecessary overrides.${name}}";
+              in builtins.foldl' (a: name: a ++ [ (assign name) ]) [] (builtins.attrNames overrides);
+
+          in final.runCommand "build-resume" {
+            nativeBuildInputs = with final; [ pandoc texlive.combined.scheme-context ];
+          } ''
+            cd ${self}
+            make OUT_DIR="$out" ${toString env}
+          '';
+      };
+
       perSystem = nixpkgs.lib.genAttrs supportedSystems;
-      pkgsFor = system: import nixpkgs { inherit system; };
-
-      buildResumeFor = system:
-        let pkgs = pkgsFor system;
-        in pkgs.runCommand "build-resume" {
-          nativeBuildInputs = with pkgs; [ pandoc texlive.combined.scheme-context ];
-        } ''
-          cd ${self}
-          make OUT_DIR="$out"
-        '';
+      pkgsFor = system: import nixpkgs { inherit system; overlays = [ self.overlays.default ]; };
     in {
+      overlays = {
+        pandocResume = overlay;
+        default = overlay;
+      };
+
       packages = perSystem (system:
         let
           pkgs = pkgsFor system;