about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEmile <git@emile.space>2024-06-09 00:19:16 +0200
committerEmile <git@emile.space>2024-06-09 00:19:16 +0200
commita4607bc235ae5753f1584c05d4e3627e35149bd7 (patch)
tree82902627b925077602cdd1e110280c0ed91f3aae
parent010aa9f3e957525b2dfdbd5265509c9f748f90fc (diff)
installing blender and adding an overlay so that it builds
-rw-r--r--nix/hosts/caladan/home_emile.nix5
-rw-r--r--nix/hosts/caladan/overlay.nix30
2 files changed, 33 insertions, 2 deletions
diff --git a/nix/hosts/caladan/home_emile.nix b/nix/hosts/caladan/home_emile.nix
index f69d477..79615fb 100644
--- a/nix/hosts/caladan/home_emile.nix
+++ b/nix/hosts/caladan/home_emile.nix
@@ -187,7 +187,8 @@
 
     portmidi
 
-  ] ++ lib.optionals stdenv.isDarwin [
-    m-cli
+    blender
+
+  # ] ++ lib.optionals stdenv.isDarwin [
   ];
 }
diff --git a/nix/hosts/caladan/overlay.nix b/nix/hosts/caladan/overlay.nix
index a96e3f3..7ed5f18 100644
--- a/nix/hosts/caladan/overlay.nix
+++ b/nix/hosts/caladan/overlay.nix
@@ -4,6 +4,36 @@
   nixpkgs = {
     overlays = [
       (self: super: {
+        kitty = super.kitty.overrideAttrs (old: {
+          preCheck = ''
+            # skip failing tests due to darwin sandbox
+            substituteInPlace kitty_tests/file_transmission.py \
+              --replace test_file_get dont_test_file_get \
+              --replace test_path_mapping_receive dont_test_path_mapping_receive \
+              --replace test_transfer_send dont_test_transfer_send
+            substituteInPlace kitty_tests/shell_integration.py \
+              --replace test_fish_integration dont_test_fish_integration
+            substituteInPlace kitty_tests/shell_integration.py \
+              --replace test_bash_integration dont_test_bash_integration
+            substituteInPlace kitty_tests/open_actions.py \
+              --replace test_parsing_of_open_actions dont_test_parsing_of_open_actions
+            substituteInPlace kitty_tests/ssh.py \
+              --replace test_ssh_connection_data dont_test_ssh_connection_data
+            substituteInPlace kitty_tests/fonts.py \
+              --replace 'class Rendering(BaseTest)' 'class Rendering'
+
+            # TODO(emile): figure out why this test is failing and activate it
+            # again.
+            substituteInPlace kittens/hyperlinked_grep/main_test.go \
+              --replace TestRgArgParsing DontTestRgArgParsing \
+
+            # theme collection test starts an http server
+            rm tools/themes/collection_test.go
+            # passwd_test tries to exec /usr/bin/dscl
+            rm tools/utils/passwd_test.go
+          '';
+        });
+
         # helix-2303 = self.callPackage ../../pkgs/helix-2303 { };
         # r2 = self.callPackage ../../pkgs/radare2-5.8.4 { };
         # ansel = self.callPackage ../../pkgs/ansel { };