Skip to content

Commit ef0f7b7

Browse files
committed
use nix-shell for running make
1 parent d10f082 commit ef0f7b7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Makefile.dist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ PROD_GHC_OPTIONS+= -with-rtsopts="-A512m -n4m"
5959
RUNGHC=runghc
6060

6161
run: .envrc build/db/state build/Generated static/prod.js static/prod.css
62-
RunDevServer
62+
nix-shell --run RunDevServer
6363

6464

6565
.envrc: default.nix TurboHaskell/NixSupport/default.nix
@@ -132,4 +132,4 @@ print-ghc-extensions:
132132
@echo ${GHC_EXTENSIONS}
133133

134134
build/db/state: .envrc
135-
mkdir -p build/db; function kill_pg() { lsof -i :8001|awk '{print \$$2}'|tail -n1|xargs kill -9; }; cd build/db && initdb state; (postgres -D state -p 8001 & ); trap kill_pg EXIT; sleep 4; createdb app -p 8001; psql -p 8001 -d app < ../../Application/Schema.sql; psql -p 8001 -d app < ../../Application/Fixtures.sql
135+
nix-shell --run "mkdir -p build/db; function kill_pg() { lsof -i :8001|awk '{print \$$2}'|tail -n1|xargs kill -9; }; cd build/db && initdb state; (postgres -D state -p 8001 & ); trap kill_pg EXIT; sleep 4; createdb app -p 8001; psql -p 8001 -d app < ../../Application/Schema.sql; psql -p 8001 -d app < ../../Application/Fixtures.sql"

0 commit comments

Comments
 (0)