git.iko.soy/obelisk
on master help sign in
Fix nix-shell call
c7291bbMatthew Bauer
lib/command/src/Obelisk/Command/Deploy.hs+1−1
compare with master
unifiedsplit
@@ -275,7 +275,7 @@ instance ToJSON KeytoolConfig
275createKeystore :: MonadObelisk m => FilePath -> KeytoolConfig -> m ()
275createKeystore :: MonadObelisk m => FilePath -> KeytoolConfig -> m ()
276createKeystore root config = do
276createKeystore root config = do
277 let expr = "with (import " <> toImplDir root <> ").reflex-platform.nixpkgs; pkgs.mkShell { buildInputs = [ pkgs.jdk ]; }"
277 let expr = "with (import " <> toImplDir root <> ").reflex-platform.nixpkgs; pkgs.mkShell { buildInputs = [ pkgs.jdk ]; }"
278− callProcessAndLogOutput (Notice,Notice) $ (proc "nix-shell" ["default.nix", "-E" , expr, "--run" , keytoolCmd]) { cwd = Just root }
278+ callProcessAndLogOutput (Notice,Notice) $ (proc "nix-shell" ["-E" , expr, "--run" , keytoolCmd]) { cwd = Just root }
279 where
279 where
280 keytoolCmd = processToShellString "keytool"
280 keytoolCmd = processToShellString "keytool"
281 [ "-genkeypair", "-noprompt"
281 [ "-genkeypair", "-noprompt"