diff options
| -rw-r--r-- | default.nix | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/default.nix b/default.nix index 17aa27c..94e4cf4 100644 --- a/default.nix +++ b/default.nix @@ -17,20 +17,18 @@ in system ? builtins.currentSystem, }: let - packages = + packageDirectory = ./pkgs; + + scope = lib.makeScope pkgs.newScope ( + final: lib.packagesFromDirectoryRecursive { - inherit (pkgs) callPackage; - directory = ./pkgs; + inherit (final) callPackage; + directory = packageDirectory; } - // { - flat-manager = pkgs.callPackage ./pkgs/flat-manager/package.nix { - inherit (packages) flat-manager; - }; - flat-manager-client = pkgs.callPackage ./pkgs/flat-manager-client/package.nix { - inherit (packages) flat-manager; - }; + ); - papa = pkgs.callPackage ./pkgs/papa/package.nix { inherit (packages) papa; }; - }; + # Filter extraneous attributes from the scope, based on the files in our package directory + packageFileNames = builtins.attrNames (builtins.readDir packageDirectory); + packages = lib.getAttrs packageFileNames scope; in packages |