diff --git a/ci/shell.nix b/ci/shell.nix
index 4a38e98795..0db7c7e189 100644
--- a/ci/shell.nix
+++ b/ci/shell.nix
@@ -57,7 +57,11 @@ let
   };
   llvmPackages = nixpkgs.llvmPackages_15;
   # see pyright/README.md for update procedure
-  pyright = nixpkgs.callPackage ./pyright {};
+  pyrightpath = builtins.pathExists ./pyright;
+  pyright = if pyrightpath then
+    nixpkgs.callPackage ./pyright {}
+  else
+    nixpkgs.callPackage ./ci/pyright {};
 in
 with nixpkgs;
 stdenvNoCC.mkDerivation ({
@@ -73,8 +77,6 @@ stdenvNoCC.mkDerivation ({
     oldPythonNixpkgs.python37
     oldPythonNixpkgs.python36
   ] ++ [
-    sdlnixpkgs.SDL2
-    sdlnixpkgs.SDL2_image
     bash
     check
     curl  # for connect tests
@@ -98,11 +100,15 @@ stdenvNoCC.mkDerivation ({
     zlib
     moreutils
   ] ++ lib.optionals (!stdenv.isDarwin) [
+    SDL2
+    SDL2_image
     autoPatchelfHook
     gcc11
     procps
     valgrind
   ] ++ lib.optionals (stdenv.isDarwin) [
+    sdlnixpkgs.SDL2
+    sdlnixpkgs.SDL2_image
     darwin.apple_sdk.frameworks.CoreAudio
     darwin.apple_sdk.frameworks.AudioToolbox
     darwin.apple_sdk.frameworks.ForceFeedback
diff --git a/core/embed/unix/main.c b/core/embed/unix/main.c
index 74c0c11786..7d15349675 100644
--- a/core/embed/unix/main.c
+++ b/core/embed/unix/main.c
@@ -495,7 +495,7 @@ MP_NOINLINE int main_(int argc, char **argv) {
 #endif
 
 #if MICROPY_ENABLE_PYSTACK
-  static mp_obj_t pystack[1024];
+  static mp_obj_t pystack[4096];
   mp_pystack_init(pystack, &pystack[MP_ARRAY_SIZE(pystack)]);
 #endif