chore: better export build from nix and dockerfile adapt

Author: Ivansete-status

Dockerfile

@@ -29,7 +29,7 @@ RUN if [ "$enable_go_cache" = "true" ]; then \
       go env -w GOCACHE=/root/.cache/go-build; \
     fi
 RUN --mount=type=cache,target="/root/.cache/go-build",id=statusgo-build-$cache_id \
-    make $build_target USE_SYSTEM_NIM=0 BUILD_TAGS="$build_tags" BUILD_FLAGS="$build_flags"
+    make $build_target USE_SYSTEM_NIM=0 BUILD_FROM_NIX=0 BUILD_TAGS="$build_tags" BUILD_FLAGS="$build_flags"
 
 # Copy binaries to the second image
 FROM debian:bookworm-slim

Makefile

@@ -235,14 +235,15 @@ $(NIM_SDS_SOURCE_DIR): ##@build Clone nim-sds
 clone-nim-sds: $(NIM_SDS_SOURCE_DIR)
 
 $(LIBSDS):
-	@if [ "X$$BUILD_FROM_NIX" == "X0" ]; then \
-		clone-nim-sds; \
-		echo "Building nim-sds" $(LIBSDS); \
-		cd $(NIM_SDS_SOURCE_DIR) && $(MAKE) update && $(MAKE) libsds USE_SYSTEM_NIM=$(USE_SYSTEM_NIM) SHELL=/bin/bash; \
-	else \
-		echo "Skipping nim-sds build from Nix..."; \
-	fi
-
+ifeq ($(BUILD_FROM_NIX),0)
+	$(MAKE) clone-nim-sds
+	@echo "Building nim-sds: $(LIBSDS)"
+	cd $(NIM_SDS_SOURCE_DIR) && \
+		$(MAKE) update && \
+		$(MAKE) libsds USE_SYSTEM_NIM=$(USE_SYSTEM_NIM) SHELL=/bin/bash
+else
+	@echo "Skipping nim-sds build from Nix..."
+endif
 build-libsds: $(LIBSDS)
 
 build-libsds-android: clone-nim-sds

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

@@ -39,6 +39,8 @@ in pkgs.buildGoModule {
   allowGoReference = true;
 
   preBuild = ''
+    export BUILD_FROM_NIX=1
+
     go run cmd/library/*.go > $NIX_BUILD_TOP/main.go
     make generate SHELL=$SHELL GO111MODULE=on GO_GENERATE_CMD='go generate'
 
@@ -58,8 +60,6 @@ in pkgs.buildGoModule {
         --replace-warn "/vendor/Nim/bin/nim" "${pkgs.nim}/bin/nim"
     fi
 
-    export BUILD_FROM_NIX=1
-
     runHook preBuild
     go build \
       -buildmode='c-archive' \