From 7aa90db876d9a402d07a8c85107375b55e143166 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Thu, 10 Jul 2025 10:10:19 +0100 Subject: [PATCH] conftest: allow for building completions when cross-compiling --- pkgs/by-name/co/conftest/package.nix | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/co/conftest/package.nix b/pkgs/by-name/co/conftest/package.nix index aab67c86bce5..5446094dedec 100644 --- a/pkgs/by-name/co/conftest/package.nix +++ b/pkgs/by-name/co/conftest/package.nix @@ -1,10 +1,12 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, installShellFiles, versionCheckHook, writableTmpDirAsHomeHook, + buildPackages, }: buildGoModule (finalAttrs: { @@ -29,12 +31,20 @@ buildGoModule (finalAttrs: { installShellFiles ]; - postInstall = '' - installShellCompletion --cmd conftest \ - --bash <($out/bin/conftest completion bash) \ - --fish <($out/bin/conftest completion fish) \ - --zsh <($out/bin/conftest completion zsh) - ''; + postInstall = + let + conftest = + if stdenv.buildPlatform.canExecute stdenv.hostPlatform then + placeholder "out" + else + buildPackages.conftest; + in + '' + installShellCompletion --cmd conftest \ + --bash <(${conftest}/bin/conftest completion bash) \ + --fish <(${conftest}/bin/conftest completion fish) \ + --zsh <(${conftest}/bin/conftest completion zsh) + ''; nativeCheckInputs = [ writableTmpDirAsHomeHook