ci: nix flake uses make target

Author: igor-sirotin

Makefile

@@ -295,11 +295,14 @@ status-go-deps:
 	go clean -modcache || true
 	go install google.golang.org/protobuf/cmd/[email protected]
 
+statusgo-c-bindings: STATUS_GO_BINDINGS_PATH ?= build/bin/statusgo-lib
 statusgo-c-bindings:
-	## cmd/library/README.md explains the magic incantation behind this
-	mkdir -p build/bin/statusgo-lib
-	go run -mod=mod cmd/library/*.go > build/bin/statusgo-lib/main.go
+	@## cmd/library/README.md explains the magic incantation behind this
+	mkdir -p $(STATUS_GO_BINDINGS_PATH)
+	go run -mod=mod cmd/library/*.go > $(STATUS_GO_BINDINGS_PATH)/main.go
 
+statusgo-library: STATUS_GO_BINDINGS_PATH ?= build/bin/statusgo-lib
+statusgo-library: STATUS_GO_LIBRARY_OUT ?= build/bin
 statusgo-library: generate
 statusgo-library: statusgo-c-bindings $(LIBWAKU) $(LIBSDS) ##@cross-compile Build status-go as static library for current platform
 	@echo "Building static library..."
@@ -308,10 +311,9 @@ statusgo-library: statusgo-c-bindings $(LIBWAKU) $(LIBSDS) ##@cross-compile Buil
 		-tags '$(BUILD_TAGS)' \
 		$(BUILD_FLAGS) \
 		-buildmode=c-archive \
-		-o build/bin/libstatus.a \
-		./build/bin/statusgo-lib
-	@echo "Static library built:"
-	@ls -la build/bin/libstatus.*
+		-o $(STATUS_GO_LIBRARY_OUT)/libstatus.a \
+		"$(STATUS_GO_BINDINGS_PATH)/main.go"
+	@echo "Static library built: $(STATUS_GO_LIBRARY_OUT)/libstatus.a"
 
 statusgo-shared-library: generate
 statusgo-shared-library: statusgo-c-bindings $(LIBWAKU) $(LIBSDS) ##@cross-compile Build status-go as shared library for current platform
@@ -383,7 +385,8 @@ generate: GO_GENERATE_CMD ?= go tool go-generate-fast
 generate: export GO_GENERATE_FAST_DEBUG ?= false
 generate: export GO_GENERATE_FAST_RECACHE ?= false
 generate:  ##@ Run generate for all given packages using go-generate-fast, fallback to `go generate` (e.g. for docker)
-	@GOROOT=$$(go env GOROOT) $(GO_GENERATE_CMD) $(PACKAGES)
+	@echo "GO_GENERATE_CMD = $(GO_GENERATE_CMD)"
+	GOROOT=$$(go env GOROOT) $(GO_GENERATE_CMD) $(PACKAGES)
 
 generate-contracts:
 	go generate ./contracts

nix/pkgs/status-go/library/default.nix

@@ -39,11 +39,6 @@ in pkgs.buildGoModule {
   allowGoReference = true;
 
   preBuild = ''
-    export NIM_SDS_INC_DIR="${pkgs.lib-sds-pkg}/include"
-    export NIM_SDS_LIB_DIR="${pkgs.lib-sds-pkg}/lib"
-
-    go run cmd/library/*.go > $NIX_BUILD_TOP/main.go
-    make generate SHELL=$SHELL GO111MODULE=on GO_GENERATE_CMD='go generate'
   '';
 
   # Build the Go library
@@ -59,12 +54,12 @@ in pkgs.buildGoModule {
     fi
 
     runHook preBuild
-    go build \
-      -buildmode='c-archive' \
-      ${optionalString stdenv.isDarwin "-ldflags=-extldflags=-lresolv"} \
-      -tags='gowaku_skip_migrations gowaku_no_rln ${optionalString stdenv.isDarwin "netgo"}' \
-      -o "$out/libstatus.a" \
-      $NIX_BUILD_TOP/main.go
+    make statusgo-library \
+        NIM_SDS_INC_DIR="${pkgs.lib-sds-pkg}/include" \
+        NIM_SDS_LIB_DIR="${pkgs.lib-sds-pkg}/lib" \
+        GO_GENERATE_CMD='go generate' \
+        STATUS_GO_BINDINGS_PATH="$NIX_BUILD_TOP" \
+        STATUS_GO_LIBRARY_OUT="$out"
     runHook postBuild
   '';
 }

nix/shell.nix

@@ -26,11 +26,8 @@ in mkShell {
   ];
 
   shellHook = ''
-    CGO_CFLAGS_SDS="-I$(pwd)../nim-sds/library/"
-    CGO_LDFLAGS_SDS="-L$(pwd)../nim-sds/build/ -lsds"
+    export NIM_SDS_SOURCE_DIR="$(pwd)/../nim-sds/"
     export USE_SYSTEM_NIM=1
-    export CGO_CFLAGS="$CGO_CFLAGS_SDS"
-    export CGO_LDFLAGS="$CGO_LDFLAGS_SDS"
   ''
   + lib.optionalString (!isMacM1) ''
     export ANDROID_HOME=${pkgs.androidPkgs.androidsdk}/libexec/android-sdk/