diff options
| author | Ruby Iris Juric <ruby@srxl.me> | 2023-12-30 13:49:01 +1100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2024-02-02 16:38:34 +0000 |
| commit | a3095f3fd38cbe7cedfb77b3a03f2eb6be135044 (patch) | |
| tree | cd9b7c1fc2d4ce11d6056605d3dfd7a20e562d6c | |
| parent | zitadel: 2.40.3 -> 2.42.10 (diff) | |
| download | nixpkgs-origin/backport-277643-to-release-23.11.tar.gz | |
zitadel: use preBuild instead of overriding buildPhaseorigin/backport-277643-to-release-23.11
(cherry picked from commit a95da94f9aae7c543b538bbb991222465605159a)
| -rw-r--r-- | pkgs/by-name/zi/zitadel/package.nix | 8 |
1 files changed, 5 insertions, 3 deletions
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 = { |