commit c0bcc7d5b593de735cb54f46d5ab5e13677500a3 (tree)
parent f1eddfc3522460dc9a1c66c507f4d4a6a2b6da9a
Author: Motiejus Jakštys <motiejus@jakstys.lt>
Date: Wed, 8 Apr 2026 06:38:56 +0000
fix mac install
Diffstat:
2 files changed, 30 insertions(+), 11 deletions(-)
diff --git 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
@@ -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
+ ]
+ )
+ )
];
}