diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix
index ca041dfa400..f9e8207d8bf 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xcbuild, xpc }:
+{ stdenv, fetchurl, xcbuild, libcxx }:
 
 stdenv.mkDerivation {
   name = "adv_cmds";
@@ -9,11 +9,12 @@ stdenv.mkDerivation {
   };
 
   patchPhase = ''
-    substituteInPlace pkill/pkill.c \
-      --replace '#include <xpc/xpc.h>' ""
+    substituteInPlace adv_cmds.xcodeproj/project.pbxproj \
+      --replace "FD201DC214369B4200906237 /* pkill.c in Sources */," ""
   '';
 
-  buildInputs = [ xcbuild xpc ];
+  buildInputs = [ xcbuild libcxx ];
+  #NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
 
   meta = {
     platforms = stdenv.lib.platforms.darwin;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf91489c892..ddee4d24e2b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17378,7 +17378,5 @@ in
 
   nitrokey-app = callPackage ../tools/security/nitrokey-app { };
 
-  adv_cmds = callPackage ../os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix {
-    inherit (darwin.apple_sdk.libs) xpc;
-  };
+  adv_cmds = callPackage ../os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix {};
 }