From 26ab45b57b1ea0d3b7d25f5f384caabc4be5db41 Mon Sep 17 00:00:00 2001
From: Rongsong Shen <rongsong.shen@gmail.com>
Date: Tue, 26 Aug 2025 10:40:52 +0800
Subject: [PATCH] refine

---
 default.nix               | 2 +-
 flake.nix                 | 5 ++---
 pkgs/x/xbuild/package.nix | 8 ++++++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/default.nix b/default.nix
index f4d2504..1a64502 100644
--- a/default.nix
+++ b/default.nix
@@ -1,4 +1,4 @@
-{pkgs,mypkgs,...}:
+{pkgs,...}:
 with pkgs;
 {
   xbuild = callPackage ./pkgs/x/xbuild/package.nix {};
diff --git a/flake.nix b/flake.nix
index 8e813dd..b680291 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,10 +3,9 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
-    mypkgs.url  = "github:shen390s/my-nix-channel?ref=master";
   };
 
-  outputs = { self, nixpkgs, mypkgs}:
+  outputs = { self, nixpkgs}:
     let
       supportedSystems = [ "x86_64-linux" ];
       forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
@@ -15,7 +14,7 @@
       packages = forAllSystems (system: let
         pkgs = nixpkgs.legacyPackages.${system};
       in
-        import ./default.nix { inherit pkgs; inherit mypkgs;});
+        import ./default.nix { inherit pkgs; });
     };
 }
 
diff --git a/pkgs/x/xbuild/package.nix b/pkgs/x/xbuild/package.nix
index 72d747f..ced9af1 100644
--- a/pkgs/x/xbuild/package.nix
+++ b/pkgs/x/xbuild/package.nix
@@ -4,7 +4,6 @@
   stdenv,
   fetchFromGitHub,
   pkgs,
-  mypkgs,
   ...
 }:
 
@@ -31,6 +30,10 @@ let
      aclocal && automake --add-missing && autoconf
   '';
   };
+
+  capnpc = pkgs.callPackage ../../pkgs/c/capnpc/package.nix {};
+  cedro  = pkgs.callPackage ../../pkgs/c/cedro/package.nix {};
+  
   wrapped_xbuild = stdenv.mkDerivation {
     name = "xbuild-wrapper";
 
@@ -61,7 +64,8 @@ let
       pkgs.elogind
       pkgs.sqlite
       pkgs.python3
-      mypkgs.capnpc
+      capnpc
+      cedro
     ];
 
     propagatedBuildInputs = [