diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/by-name/xc/xcbuild/default.nix
similarity index 100%
rename from pkgs/development/tools/xcbuild/default.nix
rename to pkgs/by-name/xc/xcbuild/default.nix
diff --git a/pkgs/development/tools/xcbuild/includes.patch b/pkgs/by-name/xc/xcbuild/includes.patch
similarity index 100%
rename from pkgs/development/tools/xcbuild/includes.patch
rename to pkgs/by-name/xc/xcbuild/includes.patch
diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/by-name/xc/xcbuild/package.nix
similarity index 100%
rename from pkgs/development/tools/xcbuild/wrapper.nix
rename to pkgs/by-name/xc/xcbuild/package.nix
diff --git a/pkgs/development/tools/xcbuild/platforms.nix b/pkgs/by-name/xc/xcbuild/platforms.nix
similarity index 100%
rename from pkgs/development/tools/xcbuild/platforms.nix
rename to pkgs/by-name/xc/xcbuild/platforms.nix
diff --git a/pkgs/development/tools/xcbuild/sdks.nix b/pkgs/by-name/xc/xcbuild/sdks.nix
similarity index 100%
rename from pkgs/development/tools/xcbuild/sdks.nix
rename to pkgs/by-name/xc/xcbuild/sdks.nix
diff --git a/pkgs/development/tools/xcbuild/setup-hook.sh b/pkgs/by-name/xc/xcbuild/setup-hook.sh
similarity index 100%
rename from pkgs/development/tools/xcbuild/setup-hook.sh
rename to pkgs/by-name/xc/xcbuild/setup-hook.sh
diff --git a/pkgs/development/tools/xcbuild/toolchains.nix b/pkgs/by-name/xc/xcbuild/toolchains.nix
similarity index 100%
rename from pkgs/development/tools/xcbuild/toolchains.nix
rename to pkgs/by-name/xc/xcbuild/toolchains.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d607957706aa..4df69b1c1603 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18701,14 +18701,22 @@ with pkgs;
 
   xcode-install = callPackage ../development/tools/xcode-install { };
 
-  xcodebuild = callPackage ../development/tools/xcbuild/wrapper.nix {
+  xcbuild = callPackage ../by-name/xc/xcbuild/package.nix {
     inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO;
+    stdenv =
+      # xcbuild is included in the SDK. Avoid an infinite recursion by using a bootstrap stdenv.
+      if stdenv.hostPlatform.isDarwin then
+        darwin.bootstrapStdenv
+      else
+        stdenv;
   };
-  xcbuild = xcodebuild;
+
   xcbuildHook = makeSetupHook {
     name = "xcbuild-hook";
     propagatedBuildInputs = [ xcbuild ];
-  } ../development/tools/xcbuild/setup-hook.sh  ;
+  } ../by-name/xc/xcbuild/setup-hook.sh;
+
+  xcodebuild = xcbuild;
 
   xcpretty = callPackage ../development/tools/xcpretty { };