fix mac install

This commit is contained in:
2026-04-08 06:38:56 +00:00
parent f1eddfc352
commit c0bcc7d5b5
2 changed files with 30 additions and 11 deletions

View File

@@ -111,6 +111,10 @@
tmuxbash = super.callPackage ./pkgs/tmuxbash.nix { };
gcloud-wrapped = super.callPackage ./pkgs/gcloud-wrapped { };
}
// super.lib.optionalAttrs super.stdenv.isDarwin {
# fish gets SIGKILL in nix sandbox on darwin, breaking direnv tests
direnv = super.direnv.overrideAttrs { doCheck = false; };
}
// super.lib.optionalAttrs super.stdenv.isLinux rec {
nicer = super.callPackage ./pkgs/nicer.nix { };
go-raceless = super.callPackage ./pkgs/go-raceless { inherit (nicer) ; };

View File

@@ -1,4 +1,8 @@
{ config, pkgs, ... }:
{
config,
pkgs,
...
}:
{
home-manager.users.${config.mj.username} = {
imports = [ ../../../shared/home/dev.nix ];
@@ -29,15 +33,26 @@
git-filter-repo
pkgs.pkgs-unstable.claude-code
(python3.withPackages (
ps: with ps; [
numpy
pyyaml
plotly
ipython
pymodbus
matplotlib
]
))
(
let
py = python3.override {
packageOverrides = _: pyPrev: {
# ffmpeg/fish get SIGKILL in nix sandbox on darwin
imageio-ffmpeg = pyPrev.imageio-ffmpeg.overridePythonAttrs { doCheck = false; };
imageio = pyPrev.imageio.overridePythonAttrs { doCheck = false; };
};
};
in
py.withPackages (
ps: with ps; [
numpy
pyyaml
plotly
ipython
pymodbus
matplotlib
]
)
)
];
}