From 8d45a910b271cf6bfa26c0ed4007392635866dc8 Mon Sep 17 00:00:00 2001
From: Quentin Aristote <quentin@aristote.fr>
Date: Mon, 14 Nov 2022 22:28:58 +0100
Subject: separate pkgs from the rest of the code

---
 flake.nix | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index dabe071..a8ebbbd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,14 +12,21 @@
   outputs = { self, nixpkgs, flake-utils, data }:
     {
       lib = import ./lib { inherit (nixpkgs) lib; };
+      overlays.default = final: prev: import ./pkgs { pkgs = final; };
     } // flake-utils.lib.eachDefaultSystem (system:
-      let pkgs = nixpkgs.legacyPackages.${system};
-      in rec {
-        packages.webpage = import ./default.nix {
-          inherit pkgs;
-          inherit (self.lib.pp) html;
-          data = data.formatWith."${system}" self.lib.pp.html;
+      let
+        pkgs = import nixpkgs {
+          inherit system;
+          overlays = [ self.overlays.default ];
         };
-        defaultPackage = packages.webpage;
+      in {
+        packages = import ./pkgs { inherit pkgs; } // {
+          webpage = import ./default.nix {
+            inherit pkgs;
+            inherit (self.lib.pp) html;
+            data = data.formatWith."${system}" self.lib.pp.html;
+          };
+        };
+        defaultPackage = self.packages."${system}".webpage;
       });
 }
-- 
cgit v1.2.3