diff --git a/flake.nix b/flake.nix index 19e604b..33681c1 100644 --- a/flake.nix +++ b/flake.nix @@ -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) ; }; diff --git a/modules/profiles/devtools/default.nix b/modules/profiles/devtools/default.nix index 4a58c35..1596f2b 100644 --- a/modules/profiles/devtools/default.nix +++ b/modules/profiles/devtools/default.nix @@ -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 + ] + ) + ) ]; }