Link libsdl statically

Signed-off-by: James Hamlin <[email protected]>
jfhamlin · Apr 8, 2024 · f13c818 · f13c818
1 parent c863bee
commit f13c818
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/go.mod b/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/mewkiz/flac v1.0.10
 	github.com/oov/audio v0.0.0-20171004131523-88a2be6dbe38
 	github.com/stretchr/testify v1.8.4
-	github.com/veandco/go-sdl2 v0.4.0
+	github.com/veandco/go-sdl2 v0.4.38
 	github.com/wailsapp/wails/v2 v2.8.0
 	gitlab.com/gomidi/midi/v2 v2.0.30
 	gonum.org/v1/gonum v0.14.0

diff --git a/go.sum b/go.sum
@@ -148,8 +148,8 @@ github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyC
 github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
 github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
 github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
-github.com/veandco/go-sdl2 v0.4.0 h1:l9q6K+Dvpd/VlZdw2ufApKnWhAQqx9UL8Zrvbjtm3Lw=
-github.com/veandco/go-sdl2 v0.4.0/go.mod h1:FB+kTpX9YTE+urhYiClnRzpOXbiWgaU3+5F2AB78DPg=
+github.com/veandco/go-sdl2 v0.4.38 h1:lx8syOA2ccXlgViYkQe2Kn/4xt+p9mdd1Qc/yYMrmSo=
+github.com/veandco/go-sdl2 v0.4.38/go.mod h1:OROqMhHD43nT4/i9crJukyVecjPNYYuCofep6SNiAjY=
 github.com/wailsapp/go-webview2 v1.0.10 h1:PP5Hug6pnQEAhfRzLCoOh2jJaPdrqeRgJKZhyYyDV/w=
 github.com/wailsapp/go-webview2 v1.0.10/go.mod h1:Uk2BePfCRzttBBjFrBmqKGJd41P6QIHeV9kTgIeOZNo=
 github.com/wailsapp/mimetype v1.4.1 h1:pQN9ycO7uo4vsUUuPeHEYoUkLVkaRntMnHJxVwYhwHs=

diff --git a/scripts/make/app.sh b/scripts/make/app.sh
@@ -3,5 +3,5 @@
 set -e
 
 # universal fails to build
-wails build -platform darwin/arm64
+wails build -platform darwin/arm64 -tags static -ldflags "-s -w"
 cp -r data/samples build/bin/muscrat.app/Contents/Resources/samples
diff --git a/shell.nix b/shell.nix
@@ -11,6 +11,9 @@ pkgs.mkShell {
     pkgs.SDL2
     pkgs.portaudio
 
+    # Seemingly needed because we're linking statically
+    pkgs.libiconv
+
     pkgs.pkgconfig
 
     frameworks.Security
@@ -19,8 +22,5 @@ pkgs.mkShell {
     frameworks.UniformTypeIdentifiers
     frameworks.ForceFeedback
     frameworks.Kernel
-
-    # for fyne
-    frameworks.UserNotifications
   ];
 }