summaryrefslogtreecommitdiff
path: root/Biz/Bild.hs
diff options
context:
space:
mode:
Diffstat (limited to 'Biz/Bild.hs')
-rw-r--r--Biz/Bild.hs19
1 files changed, 9 insertions, 10 deletions
diff --git a/Biz/Bild.hs b/Biz/Bild.hs
index d20c46e..5c28964 100644
--- a/Biz/Bild.hs
+++ b/Biz/Bild.hs
@@ -835,17 +835,16 @@ nixBuild loud Target {..} =
args =
[ argstr "srcs" <| unwords <| map str <| (root </> path) : Set.toList srcs,
argstr "root" <| str root,
- argstr "packageSet" "ghcWith"
+ argstr "packageSet" "ghcWith",
+ (argstr "langDeps" <| unwords <| map str <| Set.toList langdeps) <|> mempty,
+ argstr "name" <| str <| outname out,
+ argstr "main" <| str path,
+ argstr "mainIs" <| str <| Namespace.toHaskellModule namespace,
+ argstr "buildPhase" <| unwords
+ <| (Text.pack <| toNixFlag compiler) :
+ compilerFlags,
+ [str <| root </> "Biz/Bild/Builder.nix"]
]
- ++ (langdeps == mempty)
- ?: ( [],
- [argstr "langDeps" <| unwords <| map str <| Set.toList langdeps]
- )
- ++ [ argstr "name" <| str <| outname out,
- argstr "main" <| str path,
- argstr "mainIs" <| str <| Namespace.toHaskellModule namespace,
- [str <| root </> "Biz/Bild/Haskell.nix"]
- ]
|> mconcat
|> map Text.unpack,
onFailure = Log.fail ["bild", "instantiate", nschunk namespace] >> Log.br,