From c14a51aa9dbbe672498ed5c245b4a9e383f86f83 Mon Sep 17 00:00:00 2001
From: Gabriel Arazas <foodogsquared@foodogsquared.one>
Date: Fri, 12 Jul 2024 13:05:32 +0800
Subject: [PATCH] flake-parts/setups: properly initialize nixpkgs to be passed
 into module evaluation

---
 modules/flake-parts/setups/home-manager.nix | 3 ++-
 modules/flake-parts/setups/nixos.nix        | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/flake-parts/setups/home-manager.nix b/modules/flake-parts/setups/home-manager.nix
index 2a5fcc87..7a1ca393 100644
--- a/modules/flake-parts/setups/home-manager.nix
+++ b/modules/flake-parts/setups/home-manager.nix
@@ -15,7 +15,8 @@ let
     , specialArgs ? { }
     }:
     let
-      pkgs = inputs.${nixpkgsBranch}.legacyPackages.${system};
+      nixpkgs = inputs.${nixpkgsBranch};
+      pkgs = import nixpkgs { inherit system; };
     in
     inputs.${homeManagerBranch}.lib.homeManagerConfiguration {
       extraSpecialArgs = specialArgs // {
diff --git a/modules/flake-parts/setups/nixos.nix b/modules/flake-parts/setups/nixos.nix
index e58e553a..3219534e 100644
--- a/modules/flake-parts/setups/nixos.nix
+++ b/modules/flake-parts/setups/nixos.nix
@@ -18,13 +18,15 @@ let
       nixpkgs = inputs.${nixpkgsBranch};
 
       # Just to be sure, we'll use everything with the given nixpkgs' stdlib.
-      lib = nixpkgs.lib;
+      pkgs = import nixpkgs { inherit system; };
+      lib = pkgs.lib;
 
       # Evaluating the system ourselves (which is trivial) instead of relying
       # on nixpkgs.lib.nixosSystem flake output.
       nixosSystem = args: import "${nixpkgs}/nixos/lib/eval-config.nix" args;
     in
     (lib.makeOverridable nixosSystem) {
+      inherit pkgs;
       specialArgs = specialArgs // {
         foodogsquaredUtils = import ../../../lib/utils/nixos.nix { inherit lib; };
         foodogsquaredModulesPath = builtins.toString nixosModules;