diff --git a/modules/_overlays/pi-harness.nix b/modules/_overlays/pi-harness.nix index 133b8d3..4a211a6 100644 --- a/modules/_overlays/pi-harness.nix +++ b/modules/_overlays/pi-harness.nix @@ -12,7 +12,7 @@ src = inputs.pi-harness; pnpm = prev.pnpm_10; fetcherVersion = 1; - hash = "sha256-FgtJnmJ0/udz2A9N2DQns+a2CspMDEDk0DPUAxmCVY4="; + hash = "sha256-jn3Ra1voc3KHabHAMqqCJirGcws80n9Md4M3fo0YgKk="; }; nativeBuildInputs = [ diff --git a/modules/overlays.nix b/modules/overlays.nix index ac9e63a..22c555d 100644 --- a/modules/overlays.nix +++ b/modules/overlays.nix @@ -2,17 +2,18 @@ overlays = [ # himalaya (import ./_overlays/himalaya.nix {inherit inputs;}) - # direnv (darwin upstream makefile forces external linking) - (final: prev: { - direnv = - prev.direnv.overrideAttrs (old: { - env = - (old.env or {}) - // final.lib.optionalAttrs final.stdenv.isDarwin { - CGO_ENABLED = 1; - }; - }); - }) + # direnv (Go 1.26 on darwin disables cgo, but direnv forces external linking) + (final: prev: + prev.lib.optionalAttrs prev.stdenv.hostPlatform.isDarwin { + direnv = + prev.direnv.overrideAttrs (old: { + env = + (old.env or {}) + // { + CGO_ENABLED = 1; + }; + }); + }) # ast-grep (test_scan_invalid_rule_id fails on darwin in sandbox) (import ./_overlays/ast-grep.nix {inherit inputs;}) # jj-ryu