From 8d349e07273299fe9d7a05be856504d6de32e606 Mon Sep 17 00:00:00 2001
From: xenia <xenia.agda@gmail.com>
Date: Wed, 16 Aug 2023 11:23:01 +0200
Subject: [PATCH] fix git not being in build

---
 buildScripts/setupEnv.sh | 13 ++++++++-----
 flake.nix                |  1 +
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/buildScripts/setupEnv.sh b/buildScripts/setupEnv.sh
index 7a76989..308a593 100644
--- a/buildScripts/setupEnv.sh
+++ b/buildScripts/setupEnv.sh
@@ -1,4 +1,7 @@
-cd "$(git rev-parse --show-toplevel)"
+set +e
+ROOT="$(git rev-parse --show-toplevel)"
+[ $? -ne 0 ] && ROOT=./
+cd "$ROOT"
 
 # Check for lock
 [ -f matabas-db/dev-lock ]
@@ -11,12 +14,12 @@ export PGDATABASE=matabas
 export PGUSER=matabasare
 
 log() {
-    printf "\e[1m\e[38;5;87m==>\e[0m\e[1m %s%s\e[0m\n" "$1" "${2:-.}"
+  printf "\e[1m\e[38;5;87m==>\e[0m\e[1m %s%s\e[0m\n" "$1" "${2:-.}"
 }
 
 # Only trapped if owner
 exitHook() {
-  cd "$(git rev-parse --show-toplevel)"
+  cd "$ROOT"
   log "Stoppar brevekorren"
   pg_ctl stop --pgdata=./matabas-db
   rm -f matabas-db/dev-lock
@@ -50,14 +53,14 @@ setupDb() {
 
 P="$PWD"
 clean() {
-  cd "$(git rev-parse --show-toplevel)"
+  cd "$ROOT"
   log "Rensar byggnad"
   rm -rf artifacts
   cd - >/dev/null
 }
 
 build() {
-  cd "$(git rev-parse --show-toplevel)"
+  cd "$ROOT"
   ( source "buildScripts/build.sh" )
   RES=$?
   cd - >/dev/null
diff --git a/flake.nix b/flake.nix
index 0358cf9..e64ee6d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,6 +10,7 @@
     flake-utils.lib.eachDefaultSystem (system:
       let pkgs = nixpkgs.legacyPackages.${system};
           buildInputs = [
+            pkgs.git
             pkgs.postgresql_15_jit
             ( pkgs.ghc.withPackages (ps: with ps; [
               scotty postgresql-typed http-client-tls aeson