@@ -54,18 +54,18 @@ instance Default NixBuildConfig where
5454 def = NixBuildConfig def def mempty
5555
5656nixBuild :: MonadObelisk m => NixBuildConfig -> m FilePath
57−nixBuild cfg = do
58− let args = mconcat
59− [ [_target_path $ _nixBuildConfig_target cfg]
60− , case _target_attr $ _nixBuildConfig_target cfg of
61− Nothing -> []
62− Just attr -> ["-A", attr]
63− , mconcat [["--argstr", k, v] | Arg k v <- _nixBuildConfig_args cfg]
64− , case _nixBuildConfig_outLink cfg of
65− OutLink_Default -> []
66− OutLink_None -> ["--no-out-link"]
67− OutLink_IndirectRoot outLink -> ["--out-link", outLink]
68− ]
69− let msg = T.pack $ "Running nix-build (" <> _target_path (_nixBuildConfig_target cfg) <> ")"
70− withSpinner msg $ do
71− readProcessAndLogStderr Debug (proc "nix-build" args)
57+nixBuild cfg = withSpinner msg $ do
58+ readProcessAndLogStderr Debug $ proc "nix-build" $ mconcat
59+ [[path], attrArg, args, outLink]
60+ where
61+ path = _target_path $ _nixBuildConfig_target cfg
62+ attr = _target_attr $ _nixBuildConfig_target cfg
63+ attrArg = case attr of
64+ Nothing -> []
65+ Just a -> ["-A", a]
66+ args = mconcat [["--argstr", k, v] | Arg k v <- _nixBuildConfig_args cfg]
67+ outLink = case _nixBuildConfig_outLink cfg of
68+ OutLink_Default -> []
69+ OutLink_None -> ["--no-out-link"]
70+ OutLink_IndirectRoot l -> ["--out-link", l]
71+ msg = T.pack $ "Running nix-build on " <> path <> maybe "" (\a -> " [" <> a <> "]") attr