@@ -272,19 +272,16 @@ instance FromJSON KeytoolConfig
272272instance ToJSON KeytoolConfig
273273
274274createKeystore :: MonadObelisk m => FilePath -> KeytoolConfig -> m ()
275−createKeystore root config = do
276− let expr = "with (import " <> toImplDir root <> ").reflex-platform.nixpkgs; pkgs.mkShell { buildInputs = [ pkgs.jdk ]; }"
277− callProcessAndLogOutput (Notice,Notice) $ setCwd (Just root) $ proc "nix-shell" ["-E" , expr, "--run" , keytoolCmd]
278− where
279− keytoolCmd = processToShellString "keytool"
280− [ "-genkeypair", "-noprompt"
281− , "-keystore", _keytoolConfig_keystore config
282− , "-keyalg", "RSA", "-keysize", "2048"
283− , "-validity", "1000000"
284− , "-storepass", _keytoolConfig_storepass config
285− , "-alias", _keytoolConfig_alias config
286− , "-keypass", _keytoolConfig_keypass config
287− ]
275+createKeystore root config =
276+ callProcessAndLogOutput (Notice, Notice) $ setCwd (Just root) $ proc jreKeyToolPath
277+ [ "-genkeypair", "-noprompt"
278+ , "-keystore", _keytoolConfig_keystore config
279+ , "-keyalg", "RSA", "-keysize", "2048"
280+ , "-validity", "1000000"
281+ , "-storepass", _keytoolConfig_storepass config
282+ , "-alias", _keytoolConfig_alias config
283+ , "-keypass", _keytoolConfig_keypass config
284+ ]
288285
289286-- | Simplified deployment configuration mechanism. At one point we may revisit this.
290287writeDeployConfig :: MonadObelisk m => FilePath -> FilePath -> String -> m ()