fix stuff

This commit is contained in:
2026-03-23 21:31:14 +01:00
parent d1964e8212
commit 34ecdaf528
2 changed files with 13 additions and 12 deletions

View File

@@ -12,7 +12,7 @@
src = inputs.pi-harness; src = inputs.pi-harness;
pnpm = prev.pnpm_10; pnpm = prev.pnpm_10;
fetcherVersion = 1; fetcherVersion = 1;
hash = "sha256-FgtJnmJ0/udz2A9N2DQns+a2CspMDEDk0DPUAxmCVY4="; hash = "sha256-jn3Ra1voc3KHabHAMqqCJirGcws80n9Md4M3fo0YgKk=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@@ -2,17 +2,18 @@
overlays = [ overlays = [
# himalaya # himalaya
(import ./_overlays/himalaya.nix {inherit inputs;}) (import ./_overlays/himalaya.nix {inherit inputs;})
# direnv (darwin upstream makefile forces external linking) # direnv (Go 1.26 on darwin disables cgo, but direnv forces external linking)
(final: prev: { (final: prev:
direnv = prev.lib.optionalAttrs prev.stdenv.hostPlatform.isDarwin {
prev.direnv.overrideAttrs (old: { direnv =
env = prev.direnv.overrideAttrs (old: {
(old.env or {}) env =
// final.lib.optionalAttrs final.stdenv.isDarwin { (old.env or {})
CGO_ENABLED = 1; // {
}; CGO_ENABLED = 1;
}); };
}) });
})
# ast-grep (test_scan_invalid_rule_id fails on darwin in sandbox) # ast-grep (test_scan_invalid_rule_id fails on darwin in sandbox)
(import ./_overlays/ast-grep.nix {inherit inputs;}) (import ./_overlays/ast-grep.nix {inherit inputs;})
# jj-ryu # jj-ryu