summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzowoq <59103226+zowoq@users.noreply.github.com>2024-06-11 12:58:27 +1000
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2024-06-11 12:25:56 +0000
commit58a592ab1069e37b9e4132799ca9bf1586725066 (patch)
tree3d7d2282e784cf7040891399dafd669f462285a2
parentMerge pull request #318994 from NixOS/backport-318910-to-release-24.05 (diff)
downloadnixpkgs-origin/backport-318961-to-release-24.05.tar.gz
hercules-ci-agent: fix justStaticExecutables on aarch64-darwinorigin/backport-318961-to-release-24.05
(cherry picked from commit 9a21fd9ceff81ed339e5e975bbb11f76a702f654)
-rw-r--r--pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix b/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix
index 8d4805341d55..0da85bae969a 100644
--- a/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix
+++ b/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix
@@ -23,6 +23,10 @@ let
(o: {
postInstall = ''
${o.postInstall or ""}
+ ${lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ''
+ remove-references-to -t ${haskellPackages.hercules-ci-cnix-expr} $out/bin/hercules-ci-agent
+ remove-references-to -t ${haskellPackages.hercules-ci-cnix-expr} $out/bin/hercules-ci-agent-worker
+ ''}
mkdir -p $out/libexec
mv $out/bin/hercules-ci-agent $out/libexec
makeWrapper $out/libexec/hercules-ci-agent $out/bin/hercules-ci-agent --prefix PATH : ${lib.escapeShellArg (makeBinPath bundledBins)}