From 7397fae6f467bd0a6ed7242650e0c6bf31040c02 Mon Sep 17 00:00:00 2001
From: Evan Burkey <evan@burkey.co>
Date: Fri, 25 Jul 2025 21:47:46 -0700
Subject: [PATCH] change pathing

---
 README.md                | 2 +-
 pkg/patching/patching.go | 9 +++++++--
 pkg/ui/popup.go          | 8 ++++----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 12a1bf2..cad30d1 100644
--- a/README.md
+++ b/README.md
@@ -77,7 +77,7 @@ This appears to be a problem with using a built-in version of `rosettax87`. In o
 
 1. Install Xcode command line tools by opening a terminal and typing `xcode-select --install` and following the prompts
 2. Setup [Homebrew](https://brew.sh/) if you don't have it already
-3. Install Cmake by opening a terminal and enter `brew install cmake`
+3. Install Cmake by opening a terminal and enter `brew install cmake`. Cmake must be installed through Homebrew
 3. Run EpochSilicon and click the `Troubleshooting` button
 4. Find the line that says `Build Rosettax87 locally` and click the `Build` button, following the prompts 
 
diff --git a/pkg/patching/patching.go b/pkg/patching/patching.go
index 0465285..3056eee 100644
--- a/pkg/patching/patching.go
+++ b/pkg/patching/patching.go
@@ -21,6 +21,11 @@ import (
 	"fyne.io/fyne/v2/dialog"
 )
 
+const (
+	CmakePath = "/opt/homebrew/bin/cmake"
+	ClangPath = "/usr/bin/clang"
+)
+
 func PatchEpoch(myWindow fyne.Window, updateAllStatuses func()) {
 	log.Debug("Patch Epoch clicked")
 	if paths.EpochPath == "" {
@@ -486,14 +491,14 @@ func BuildRosetta() (string, string, error) {
 		return "", "", fmt.Errorf("failed to clone repository: %v", err)
 	}
 
-	cmd := exec.Command("cmake", "-B", "build")
+	cmd := exec.Command(CmakePath, "-B", "build")
 	cmd.Dir = clonedDir
 	err = cmd.Run()
 	if err != nil {
 		return "", "", fmt.Errorf("failed to create build files: %v", err)
 	}
 
-	cmd = exec.Command("cmake", "--build", "build")
+	cmd = exec.Command(CmakePath, "--build", "build")
 	cmd.Dir = clonedDir
 	err = cmd.Run()
 	if err != nil {
diff --git a/pkg/ui/popup.go b/pkg/ui/popup.go
index e6bf964..b8193eb 100644
--- a/pkg/ui/popup.go
+++ b/pkg/ui/popup.go
@@ -208,14 +208,14 @@ func showTroubleshootingPopup() {
 		dialog.NewConfirm("Build rosettax87", msg, func(confirm bool) {
 			if confirm {
 				// Check for dependencies
-				if err := exec.Command("clang", "--version").Run(); err != nil {
-					m := fmt.Errorf("xcode command line tools are not installed on your computer. Click the Website button in the app and read the instructions on building rosettax87 before trying again")
+				if err := exec.Command(patching.ClangPath, "--version").Run(); err != nil {
+					m := fmt.Errorf("xcode command line tools are not installed on your computer. Click the Website button in the app and read the instructions on building rosettax87 before trying again. Error: %v", err)
 					log.Error(m.Error())
 					dialog.ShowError(m, currentWindow)
 					return
 				}
-				if err := exec.Command("cmake", "--version").Run(); err != nil {
-					m := fmt.Errorf("Cmake is not installed on your computer. Click the Website button in the app and read the instructions on building rosettax87 before trying again")
+				if err := exec.Command(patching.CmakePath, "--version").Run(); err != nil {
+					m := fmt.Errorf("Cmake is not installed on your computer. Click the Website button in the app and read the instructions on building rosettax87 before trying again. Error: %v", err)
 					log.Error(m.Error())
 					dialog.ShowError(m, currentWindow)
 					return