refine

default.nix

@@ -1,4 +1,4 @@
-{pkgs,mypkgs,...}:
+{pkgs,...}:
 with pkgs;
 {
   xbuild = callPackage ./pkgs/x/xbuild/package.nix {};

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; });
     };
 }
 

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 = [