Merge pull request #210 from urbit/pq/fix-mac-x86-build

remove cargo-watch for darwin-x86 because it doesn't build
zorp-corp · Feb 9, 2024 · 888e604 · 888e604
2 parents 7372095 + 368f858
commit 888e604
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/rust/flake.nix b/rust/flake.nix
@@ -29,14 +29,15 @@
               "rustfmt"
               "rust-src"
             ])
-            pkgs.cargo-watch
             pkgs.bacon
             pkgs.iconv
             pkgs.llvmPackages.clang
             pkgs.pkg-config
             pkgs.urcrypt
           ] ++
-            (nixpkgs.lib.lists.optional (parsedSystem.kernel.name != "darwin") pkgs.gdb); # nixpkgs won't build gdb for darwin
+            (nixpkgs.lib.lists.optional (parsedSystem.kernel.name != "darwin") pkgs.gdb) # nixpkgs won't build gdb for darwin
+            ++
+            (nixpkgs.lib.lists.optional (parsedSystem.kernel.name != "darwin" || parsedSystem.cpu.name != "x86_64") pkgs.cargo-watch); # nixpkgs won't build cargo-watch for darwin-x86
         };
       }
     );