dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #318961 from qowoz/hercules

Browse Source 
hercules-ci-agent: fix justStaticExecutables on aarch64-darwin
This commit is contained in:
Robert Hensing 2024-06-11 14:25:29 +02:00 committed by GitHub
commit e46ce3db04
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix
View File

@ -23,15 +23,16 @@ let
(o: { (o: {
postInstall = '' postInstall = ''
${o.postInstall or ""} ${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 mkdir -p $out/libexec
mv $out/bin/hercules-ci-agent $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)} makeWrapper $out/libexec/hercules-ci-agent $out/bin/hercules-ci-agent --prefix PATH : ${lib.escapeShellArg (makeBinPath bundledBins)}
''; '';
}) })
(addBuildTools [ makeBinaryWrapper ] (addBuildTools [ makeBinaryWrapper ] (justStaticExecutables haskellPackages.hercules-ci-agent));
# TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013
((if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else haskell.lib.compose.justStaticExecutables)
haskellPackages.hercules-ci-agent));
in pkg.overrideAttrs (finalAttrs: o: { in pkg.overrideAttrs (finalAttrs: o: {
meta = o.meta // { meta = o.meta // {
position = toString ./default.nix + ":1"; position = toString ./default.nix + ":1";