on master help sign in
Support --argstr in nixBuild
commit022abe5de51b5faa1e37ea98206a6165d26ee243 authorLuigy Leon <luigy@outlook.com> dateFri 11 May 2018, 12:23 (8 years ago) parent67ec4bb
1 file changed+9−1
lib/command/src/Obelisk/Command/Nix.hs+9−1
lib/command/src/Obelisk/Command/Nix.hs+9−1
@@ -6,6 +6,7 @@ module Obelisk.Command.Nix
66 , NixBuildConfig (..)
77 , Target (..)
88 , OutLink (..)
9+ , Arg (..)
910 ) where
1011
1112import qualified Data.ByteString.Lazy as LBS
@@ -39,13 +40,19 @@ instance Default Target where
3940 , _target_attr = Nothing
4041 }
4142
43+data Arg = Arg
44+ { _arg_key :: String
45+ , _arg_value :: String
46+ }
47+
4248data NixBuildConfig = NixBuildConfig
4349 { _nixBuildConfig_target :: Target
4450 , _nixBuildConfig_outLink :: OutLink
51+ , _nixBuildConfig_args :: [Arg]
4552 }
4653
4754instance Default NixBuildConfig where
48− def = NixBuildConfig def def
55+ def = NixBuildConfig def def mempty
4956
5057nixBuild :: NixBuildConfig -> IO FilePath
5158nixBuild cfg = do
@@ -54,6 +61,7 @@ nixBuild cfg = do
5461 , case _target_attr $ _nixBuildConfig_target cfg of
5562 Nothing -> []
5663 Just attr -> ["-A", attr]
64+ , mconcat [["--argstr", k, v] | Arg k v <- _nixBuildConfig_args cfg]
5765 , case _nixBuildConfig_outLink cfg of
5866 OutLink_Default -> []
5967 OutLink_None -> ["--no-out-link"]