chore: fix crosscompiling (#832)

nhost · Feb 14, 2024 · 9b11915 · 9b11915
1 parent 8cb5541
commit 9b11915
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -1,9 +1,9 @@
 ifeq ($(shell uname -m),x86_64)
   HOST_ARCH?=x86_64
-  GOARCH?=amd64
+  ARCH?=amd64
 else ifeq ($(shell uname -m),arm64)
   HOST_ARCH?=aarch64
-  GOARCH?=arm64
+  ARCH?=arm64
 endif
 
 ifeq ($(shell uname -o),Darwin)
@@ -24,14 +24,14 @@ check:  ## Run nix flake check
 .PHONY: build
 build:  ## Build application and places the binary under ./result/bin
 	nix build $(docker-build-options) \
-		.\#cli-$(GOARCH)-$(OS) \
+		.\#cli-$(ARCH)-$(OS) \
 		--print-build-logs
 
 
 .PHONY: build-docker-image
 build-docker-image:  ## Build docker image
 	nix build $(docker-build-options) \
-		.\#packages.$(HOST_ARCH)-linux.docker-image-$(GOARCH) \
+		.\#packages.$(HOST_ARCH)-linux.docker-image-$(ARCH) \
 		--print-build-logs
 	docker load < result
 

diff --git a/flake.nix b/flake.nix
@@ -100,31 +100,31 @@
           cli = nixops-lib.go.package {
             inherit name submodule description src version ldflags buildInputs nativeBuildInputs;
 
-            cgoEnabled = false;
+            cgoEnabled = 0;
           };
 
           cli-arm64-darwin = (nixops-lib.go.package {
             inherit name submodule description src version ldflags buildInputs nativeBuildInputs;
 
-            cgoEnabled = false;
+            cgoEnabled = 0;
           }).overrideAttrs (old: old // { GOOS = "darwin"; GOARCH = "arm64"; });
 
           cli-amd64-darwin = (nixops-lib.go.package {
             inherit name submodule description src version ldflags buildInputs nativeBuildInputs;
 
-            cgoEnabled = false;
+            cgoEnabled = 0;
           }).overrideAttrs (old: old // { GOOS = "darwin"; GOARCH = "amd64"; });
 
           cli-arm64-linux = (nixops-lib.go.package {
             inherit name submodule description src version ldflags buildInputs nativeBuildInputs;
 
-            cgoEnabled = false;
+            cgoEnabled = 0;
           }).overrideAttrs (old: old // { GOOS = "linux"; GOARCH = "arm64"; });
 
           cli-amd64-linux = (nixops-lib.go.package {
             inherit name submodule description src version ldflags buildInputs nativeBuildInputs;
 
-            cgoEnabled = false;
+            cgoEnabled = 0;
           }).overrideAttrs (old: old // { GOOS = "linux"; GOARCH = "amd64"; });
 
           docker-image-arm64 = nixops-lib.go.docker-image {