From a95da94f9aae7c543b538bbb991222465605159a Mon Sep 17 00:00:00 2001 From: Ruby Iris Juric Date: Sat, 30 Dec 2023 13:49:01 +1100 Subject: zitadel: use preBuild instead of overriding buildPhase --- pkgs/by-name/zi/zitadel/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'pkgs/by-name/zi') diff --git a/pkgs/by-name/zi/zitadel/package.nix b/pkgs/by-name/zi/zitadel/package.nix index 08078ad4066f..e8118b463ef2 100644 --- a/pkgs/by-name/zi/zitadel/package.nix +++ b/pkgs/by-name/zi/zitadel/package.nix @@ -105,10 +105,11 @@ buildGo121Module rec { proxyVendor = true; vendorHash = goModulesHash; + ldflags = [ "-X 'github.com/zitadel/zitadel/cmd/build.version=${version}'" ]; # Adapted from Makefile in repo, with dependency fetching and protobuf codegen # bits removed - buildPhase = '' + preBuild = '' mkdir -p pkg/grpc cp -r ${protobufGenerated}/grpc/github.com/zitadel/zitadel/pkg/grpc/* pkg/grpc mkdir -p openapi/v2/zitadel @@ -123,12 +124,13 @@ buildGo121Module rec { go run internal/api/assets/generator/asset_generator.go -directory=internal/api/assets/generator/ -assets=docs/apis/assets/assets.md cp -r ${passthru.console}/* internal/api/ui/console/static - CGO_ENABLED=0 go build -o zitadel -v -ldflags="-s -w -X 'github.com/zitadel/zitadel/cmd/build.version=${version}'" ''; + doCheck = false; + installPhase = '' mkdir -p $out/bin - install -Dm755 zitadel $out/bin/ + install -Dm755 $GOPATH/bin/zitadel $out/bin/ ''; passthru = { -- cgit 1.4.1