From 2eb72a7753283aa6e023bc526a1cc8b355e77520 Mon Sep 17 00:00:00 2001
From: Nathan Perry <np@nathanperry.dev>
Date: Wed, 30 Nov 2022 06:04:37 -0500
Subject: nixos: shellcheck dbinit.sh

---
 flake.nix | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/flake.nix b/flake.nix
index a65e833..af73850 100644
--- a/flake.nix
+++ b/flake.nix
@@ -72,6 +72,7 @@
       remapPathPrefix = true;
     };
 
+
   in (flake-utils.lib.eachDefaultSystem (system:
     let
       pkgs = import nixpkgs {
@@ -82,6 +83,12 @@
         ];
       };
 
+      dbInit = (pkgs.writeShellScript "thulani-dbinit" (builtins.readFile ./nix/dbinit.sh)).overrideAttrs (final: prev: {
+        checkPhase = ''
+          ${pkgs.shellcheck}/bin/shellcheck $out
+        '';
+      });
+
       devToolchain = (mkBuildToolchain pkgs).override {
         extensions = [
           "rust-src"
@@ -104,13 +111,19 @@
         RUST_SRC_PATH = "${devToolchain}/lib/rustlib/src/rust";
       };
 
-      packages.default = pkg;
+      packages = {
+        default = pkg;
+        inherit dbInit;
+      };
+
       apps.default = {
         type = "app";
         program = "${pkg}/bin/thulani";
       };
     }) // {
-      hydraJobs.thulani.x86_64-linux = self.packages.x86_64-linux.default;
+      hydraJobs = {
+        inherit (self.packages) x86_64-linux;
+      };
 
       overlays.default = final: prev: let
         withRust = ((import inputs.rust-overlay) final prev);
@@ -295,9 +308,9 @@
               Type = "exec";
               ExecStart = "${cfg.package}/bin/thulani";
               ExecStartPre = let
-                preStart = pkgs.writeShellScript "thulani-dbinit" (builtins.readFile ./nix/dbinit.sh);
+                inherit (self.packages.${pkgs.system}) dbInit;
 
-              in lib.mkIf cfg.postgres.enable "+${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} -- ${preStart} ${config.services.postgresql.package}/bin/psql ${cfg.postgres.db} ${cfg.user}";
+              in lib.mkIf cfg.postgres.enable "+${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} -- ${dbInit} ${config.services.postgresql.package}/bin/psql ${cfg.postgres.db} ${cfg.user}";
 
               EnvironmentFile = cfg.envFiles;
 
-- 
cgit v1.3.1