diff --git a/v2/internal/system/system.go b/v2/internal/system/system.go index de6067d5..98f7f7f0 100644 --- a/v2/internal/system/system.go +++ b/v2/internal/system/system.go @@ -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) diff --git a/v2/internal/system/system_linux.go b/v2/internal/system/system_linux.go index 213222e2..23775ec2 100644 --- a/v2/internal/system/system_linux.go +++ b/v2/internal/system/system_linux.go @@ -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()