From 88af507c33ab32ae23e35bde9cd7fbbc0d534390 Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Thu, 3 Aug 2023 22:25:06 -0400 Subject: Move buildPhase to a nix-instantiate argument --- Biz/Bild.hs | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'Biz/Bild.hs') 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, -- cgit v1.2.3