diff options
| author | Ben Sima <ben@bsima.me> | 2023-08-21 20:36:12 -0400 |
|---|---|---|
| committer | Ben Sima <ben@bsima.me> | 2023-08-21 21:09:34 -0400 |
| commit | e5a6175e044d69b8f598a2c2acb9bcfd77b9001c (patch) | |
| tree | e7b96ff09dd46444cb1c5fd9575ef897392800eb /Biz/Dev.nix | |
| parent | 3f9bef378810eb259e9fdc28cc06ebf2be9d6cd8 (diff) | |
Refactor the build system for readability
Lots of changes here but the code is much improved. The nix code is clearer and
structured better.
The Haskell code improved in response to the nix changes. I needed to use a
qualified path instead of the abspath because the BIZ_ROOT changes based on
whether bild runs in nix or runs in the user environment.
Rather than passing every argument into Builder.nix, now I just pass the json
from bild and deconstruct it in nix. This is obviously a much better design and
it only came to be after sleeping on it the other night.
Diffstat (limited to 'Biz/Dev.nix')
| -rw-r--r-- | Biz/Dev.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Biz/Dev.nix b/Biz/Dev.nix index 6be4856..245e58c 100644 --- a/Biz/Dev.nix +++ b/Biz/Dev.nix @@ -1,5 +1,5 @@ -{ bild ? import ./Bild.nix {} }: - +{ nixpkgs ? import ./Bild.nix {} }: +with nixpkgs; # Dev machine for work and building stuff. bild.os { @@ -21,7 +21,7 @@ bild.os { services.dragons = { enable = true; port = 8095; - package = bild.ghc ./Dragons.hs; + package = bild.run ./Dragons.hs; keep = "/var/dragons/keep"; depo = "/var/dragons/depo"; }; |