waveterm/wails
0
0
Fork 0
mirror of https://github.com/wavetermdev/wails.git synced 2026-08-05 13:53:43 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix compile issue

Browse Source
This commit is contained in:
Lea Anthony
2022-03-16 08:41:34 +11:00
parent d7395fc56a
commit 1996e8b2ba
2 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v2/internal/system/system.go
+1 -30
View File
@@ -1,6 +1,7 @@
package system
import (
"github.com/wailsapp/wails/v2/internal/shell"
"github.com/wailsapp/wails/v2/internal/system/operatingsystem"
"github.com/wailsapp/wails/v2/internal/system/packagemanager"
"os/exec"
@@ -97,36 +98,6 @@ func checkNSIS() *packagemanager.Dependancy {
}
}
func checkGCC() *packagemanager.Dependancy {
version := packagemanager.AppVersion("gcc")
return &packagemanager.Dependancy{
Name: "gcc ",
PackageName: "N/A",
Installed: version != "",
InstallCommand: "Install via your package manager",
Version: version,
Optional: false,
External: false,
}
}
func checkPkgConfig() *packagemanager.Dependancy {
version := packagemanager.AppVersion("pkg-config")
return &packagemanager.Dependancy{
Name: "pkg-config ",
PackageName: "N/A",
Installed: version != "",
InstallCommand: "Install via your package manager",
Version: version,
Optional: false,
External: false,
}
}
func checkLibrary(name string) func() *packagemanager.Dependancy {
return func() *packagemanager.Dependancy {
output, _, _ := shell.RunCommand(".", "pkg-config", "--cflags", name)
v2/internal/system/system_linux.go
+30
View File
@@ -8,6 +8,36 @@ import (
"github.com/wailsapp/wails/v2/internal/system/packagemanager"
)
func checkGCC() *packagemanager.Dependancy {
version := packagemanager.AppVersion("gcc")
return &packagemanager.Dependancy{
Name: "gcc ",
PackageName: "N/A",
Installed: version != "",
InstallCommand: "Install via your package manager",
Version: version,
Optional: false,
External: false,
}
}
func checkPkgConfig() *packagemanager.Dependancy {
version := packagemanager.AppVersion("pkg-config")
return &packagemanager.Dependancy{
Name: "pkg-config ",
PackageName: "N/A",
Installed: version != "",
InstallCommand: "Install via your package manager",
Version: version,
Optional: false,
External: false,
}
}
func checkLocallyInstalled(checker func() *packagemanager.Dependancy, dependency *packagemanager.Dependancy) {
if !dependency.Installed {
locallyInstalled := checker()