1 files changed, 8 insertions, 4 deletions
diff --git a/clef/flake.nix b/clef/flake.nix
index 66e350f..f20b1b8 100644
--- a/clef/flake.nix
+++ b/clef/flake.nix
@@ -16,17 +16,21 @@
 
   outputs = { self, nixpkgs, flake-utils, ... } @ inputs: (flake-utils.lib.eachDefaultSystem (system: {
       packages = let
+        packages = nixpkgs.legacyPackages.${system}.callPackages ./nix/pkgs {};
+
         pkgs = import nixpkgs {
           inherit system;
 
           overlays = with self.overlays; [
             kicad
             nix-filter
+
+            (final: prev: packages)
           ];
         };
 
         clef = pkgs.callPackage ./nix;
-      in {
+      in packages // {
         inherit clef;
         default = clef;
       };
@@ -56,14 +60,14 @@
 
     in base // {
       # clef built against its own nixpkgs import with its required overlay
-      # deps (cadquery, kicad, occt).
+      # deps (kicad, occt).
       # 
       # _This will cause another evaluation of nixpkgs_, which is generally
       # undesirable. However, this provides for the most hassle-free way to
       # use clef, as you don't need to include all of the overlay dependencies
       # in your nixpkgs.
       default = final: prev: {
-        clef = self.packages.${prev.system}.default;
+        inherit (self.packages.${prev.system}) clef;
       };
 
       # No overlay dependencies included -- clef will not work by default.
@@ -73,7 +77,7 @@
       # 
       # Assuming you've pinned clef's nixpkgs to the same version as yours.
       # This functionality is provided to give you an option
-      freestanding = final: prev: {
+      freestanding = final: prev: (prev.callPackage ./nix/pkgs {}) {
         clef = prev.callPackage ./nix;
       };
     };