diff --git a/default.nix b/default.nix
index 1a64502..7831c2c 100644
--- a/default.nix
+++ b/default.nix
@@ -1,7 +1,16 @@
 {pkgs,...}:
 with pkgs;
-{
-  xbuild = callPackage ./pkgs/x/xbuild/package.nix {};
+let
   cedro = callPackage ./pkgs/c/cedro/package.nix {};
   capnpc = callPackage ./pkgs/c/capnpc/package.nix {};
+  xbuild = callPackage ./pkgs/x/xbuild/package.nix {
+    pkgs = pkgs;
+    cedro = cedro;
+    capnpc = capnpc;
+  };
+in
+{
+  xbuild = xbuild;
+  capnpc = capnpc;
+  cedro  = cedro;
 }
diff --git a/pkgs/x/xbuild/package.nix b/pkgs/x/xbuild/package.nix
index ced9af1..6d2a83a 100644
--- a/pkgs/x/xbuild/package.nix
+++ b/pkgs/x/xbuild/package.nix
@@ -4,6 +4,8 @@
   stdenv,
   fetchFromGitHub,
   pkgs,
+  capnpc,
+  cedro,
   ...
 }:
 
@@ -31,9 +33,6 @@ let
   '';
   };
 
-  capnpc = pkgs.callPackage ../../pkgs/c/capnpc/package.nix {};
-  cedro  = pkgs.callPackage ../../pkgs/c/cedro/package.nix {};
-  
   wrapped_xbuild = stdenv.mkDerivation {
     name = "xbuild-wrapper";