From da56927968ff262d567ad9936986c7b3762e951f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 9 Oct 2024 13:43:54 +0200
Subject: [PATCH] eval-clan-modules: don't re-import nixpkgs

---
 lib/default.nix                   | 5 ++++-
 lib/eval-clan-modules/default.nix | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/default.nix b/lib/default.nix
index 1faa640d0..530ddd620 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -5,7 +5,10 @@
   ...
 }:
 let
-  eval = import ./eval-clan-modules { inherit clan-core nixpkgs lib; };
+  eval = import ./eval-clan-modules {
+    inherit clan-core lib;
+    pkgs = nixpkgs.legacyPackages.x86_64-linux;
+  };
 in
 {
   inherit (eval) evalClanModules evalClanModulesWithRoles;
diff --git a/lib/eval-clan-modules/default.nix b/lib/eval-clan-modules/default.nix
index b501ae461..bb4220173 100644
--- a/lib/eval-clan-modules/default.nix
+++ b/lib/eval-clan-modules/default.nix
@@ -1,18 +1,18 @@
 {
-  nixpkgs,
   clan-core,
   lib,
+  pkgs,
 }:
 let
-  inherit (import nixpkgs { system = "x86_64-linux"; }) pkgs;
 
   inherit (clan-core) clanModules;
 
   baseModule = {
     imports = (import (pkgs.path + "/nixos/modules/module-list.nix")) ++ [
       {
-        nixpkgs.hostPlatform = "x86_64-linux";
+        nixpkgs.pkgs = pkgs;
         clan.core.name = "dummy";
+        system.stateVersion = lib.version;
       }
     ];
   };