diff options
Diffstat (limited to 'Biz/Bild.hs')
| -rw-r--r-- | Biz/Bild.hs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Biz/Bild.hs b/Biz/Bild.hs index 2ec0c7f..f8385c8 100644 --- a/Biz/Bild.hs +++ b/Biz/Bild.hs @@ -680,7 +680,10 @@ analyze hmap ns = case Map.lookup ns hmap of "--out-link", root </> nixdir </> Namespace.toPath namespace, "--builders", - toNixFlag builder + toNixFlag builder, + "--arg", + "bild", + str <| "import " <> root </> "Biz/Bild.nix {}" ] |> map Text.pack, out = Meta.None, @@ -1059,8 +1062,6 @@ nixBuild loud maxJobs cores target@(Target {..}) = >> run symlink x -> pure x where - argstr :: Text -> Text -> [Text] - argstr n v = ["--argstr", n, v] instantiate root = Proc { loud = loud, @@ -1070,7 +1071,8 @@ nixBuild loud maxJobs cores target@(Target {..}) = -- is tightly coupled with the code in the nix builder and there's no -- way around that, methinks. args = - [ argstr "analysisJSON" <| str <| Aeson.encode <| (Map.singleton namespace target :: Analysis), + [ ["--argstr", "analysisJSON", str <| Aeson.encode <| (Map.singleton namespace target :: Analysis)], + ["--arg", "bild", str <| "import " <> root </> "Biz/Bild.nix {}"], [str <| root </> "Biz/Bild/Builder.nix"] ] |> mconcat |