From ce25f6f2db789d8374d0fa5a737cd6f3ab09d813 Mon Sep 17 00:00:00 2001 From: Nick Cao <nickcao@nichi.co> Date: Sun, 12 Dec 2021 15:26:47 +0800 Subject: [PATCH] argo: fix cross compilation --- pkgs/applications/networking/cluster/argo/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 52bd37ec6138..976ef396acfe 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -1,11 +1,11 @@ -{ lib, buildGoModule, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, buildGoPackage, fetchFromGitHub, installShellFiles, pkgsBuildBuild, stdenv }: let # Argo can package a static server in the CLI using the `staticfiles` go module. # We build the CLI without the static server for simplicity, but the tool is still required for # compilation to succeed. # See: https://github.com/argoproj/argo/blob/d7690e32faf2ac5842468831daf1443283703c25/Makefile#L117 - staticfiles = buildGoPackage rec { + staticfiles = pkgsBuildBuild.buildGoPackage rec { name = "staticfiles"; src = fetchFromGitHub { owner = "bouk"; @@ -54,7 +54,10 @@ buildGoModule rec { postInstall = '' for shell in bash zsh; do - $out/bin/argo completion $shell > argo.$shell + ${if (stdenv.buildPlatform == stdenv.hostPlatform) + then "$out/bin/argo" + else "${pkgsBuildBuild.argo}/bin/argo" + } completion $shell > argo.$shell installShellCompletion argo.$shell done '';