diff --git a/nix/sources.json b/nix/sources.json
index c3de82e1..7cd693b3 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -5,10 +5,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6e31010bb321acfebdb43952d9cde86eaf0e70ad",
-        "sha256": "0yfc5c8qy7dklag82y4d823d0i25r3flfxqbzyq6wgn94k9j5cpf",
+        "rev": "2b78ecc45e163d655c08c9a4cffb4a91c66d0493",
+        "sha256": "092l8qa82w97hj2pal2hzdzxnw20jya5pz9x2igj7swhpzmhxyzk",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/6e31010bb321acfebdb43952d9cde86eaf0e70ad.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/2b78ecc45e163d655c08c9a4cffb4a91c66d0493.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }
diff --git a/shell.nix b/shell.nix
index 1d769537..34cb6a38 100644
--- a/shell.nix
+++ b/shell.nix
@@ -6,11 +6,17 @@
 
 pkgs.mkShell {
   nativeBuildInputs = [
-    pkgs.go_1_21
+    pkgs.go_1_24
     pkgs.clojure
   ];
 
   shellHook = ''
         export MACOSX_DEPLOYMENT_TARGET=12.0
+
+        # Remove xcbuild's xcrun from PATH
+        export PATH=$(echo "$PATH" | sed "s|${pkgs.xcbuild.xcrun}/bin||g")
+
+        # Let Xcode pick its own developer dir
+        unset DEVELOPER_DIR
     '';
 }