chore(lix): Use the global patch infrastructure for lix

2024-11-22 12:56:14 +01:00 · 2024-11-22 12:56:14 +01:00 · 1f9f56ac91
commit 1f9f56ac91
parent 75b621e298
2 changed files with 9 additions and 13 deletions
--- a/hive.nix
+++ b/hive.nix
@ -64,23 +64,12 @@ in
  };

  defaults =
-    {
-      pkgs,
-      name,
-      nodeMeta,
-      ...
-    }:
+    { name, nodeMeta, ... }:
    {
      # Import the default modules
      imports = [
        ./modules
-        (import "${sources.lix-module}/module.nix" {
-          lix = pkgs.applyPatches {
-            name = "lix-2.90.patched";
-            src = sources.lix;
-            patches = [ ./patches/00-disable-installChecks-lix.patch ];
-          };
-        })
+        (import "${sources.lix-module}/module.nix" { inherit (sources) lix; })
      ];

      # Include default secrets
--- a/patches/default.nix
+++ b/patches/default.nix
@ -1,4 +1,11 @@
 {
+  lix = [
+    {
+      _type = "static";
+      path = ./00-disable-installChecks-lix.patch;
+    }
+  ];
+
  "nixos-24.05" = [
    {
      _type = "static";