diff --git a/pkgs/c/capnpc/package.nix b/pkgs/c/capnpc/package.nix
index 11e8158..d9faccf 100644
--- a/pkgs/c/capnpc/package.nix
+++ b/pkgs/c/capnpc/package.nix
@@ -13,8 +13,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "shen390s";
     repo = "c-capnproto";
-    rev = "master";
-    sha256 = "sha256-U+yUYYvfhPjvADtHsjN5LvOUzFEXZrTmmpqfypf/4Ik=";
+    rev = "main";
+    sha256 = "sha256-QEy1CiXhBPWihvb3K8ZZDAME0OiXf62QHXQdypKfDRg=";
   };
 
   nativeBuildInputs = [
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
   '';
   
   configurePhase = ''
-      cmake --preset=ci-linux_x86_64 -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=OFF
+      cmake --preset=ci-linux_x86_64 -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=$out
   '';
   
   buildPhase = ''
@@ -36,11 +36,6 @@ stdenv.mkDerivation {
   '';           
 
   installPhase = ''
-     mkdir -p $out/bin
-     mkdir -p $out/include
-     mkdir -p $out/lib
-     cp build/capnpc-c $out/bin
-     cp build/libCapnC_Runtime.a $out/lib
-     cp lib/capnp_c.h $out/include
+      cmake --install build
   '';
 }
diff --git a/pkgs/x/xbuild/package.nix b/pkgs/x/xbuild/package.nix
index 215a70f..3e43709 100644
--- a/pkgs/x/xbuild/package.nix
+++ b/pkgs/x/xbuild/package.nix
@@ -18,8 +18,8 @@ let
       owner = "shen390s";
       repo = "xbuild";
       rev = "master";
-      #    sha256 = "sha256-DLq7vC+4k2TMy5jKvQkFTy+xZmpvl0+DiWcd7CBVbgw=";
-      sha256 =  "sha256-QuTXftn0LxkSGq5lZFbnGKlTRxIqEsJrfKzT+aa8a5k=";
+      # sha256 =  "sha256-V4trb5RhJwdvSMHRafMNJ1h2oDfZ8zabA9Vm2CVJLdg=";
+      sha256 = "sha256-V4trb5RhJwdvSMHRafMNJ1h2oDfZ8zabA9Vm2CVJLdg=";
     };
 
     nativeBuildInputs = [ 
@@ -47,6 +47,7 @@ let
       pkgs.pkg-config
       pkgs.gnumake
       pkgs.gcc
+      pkgs.zig
       pkgs.coreutils
       pkgs.bash
       pkgs.strace
@@ -67,6 +68,11 @@ let
       pkgs.ncurses
       pkgs.capnproto
       pkgs.postgresql
+      pkgs.findutils
+      pkgs.which
+      pkgs.gnugrep
+      pkgs.gawk
+      pkgs.gnused
       capnpc
       cedro
     ];