From c88fde3de47277b3d0c1f16f740ff8ceb079e161 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20M=C3=BCller?= <neikos@neikos.email>
Date: Tue, 4 Mar 2025 11:37:23 +0100
Subject: [PATCH] Don't put a system to mkLib
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marcel Müller <neikos@neikos.email>
---
 flake.nix | 65 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 35 insertions(+), 30 deletions(-)

diff --git a/flake.nix b/flake.nix
index c9bf36c..a56b8af 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,40 +13,45 @@
 
   outputs =
     inputs:
-    inputs.flake-utils.lib.eachDefaultSystem (
-      system:
-      let
-        pkgs = import inputs.nixpkgs {
-          inherit system;
-          overlays = [
-            inputs.rust-overlay.overlays.default
+    (
+      inputs.flake-utils.lib.eachDefaultSystem (
+        system:
+        let
+          pkgs = import inputs.nixpkgs {
+            inherit system;
+            overlays = [
+              inputs.rust-overlay.overlays.default
+            ];
+          };
+
+          rustTarget = pkgs.rust-bin.stable.latest.default.override { };
+
+          dylintLib = import ./mk-lib.nix {
+            inherit pkgs;
+            inherit (inputs) crane;
+          };
+
+          lints = [
+            {
+              toolchain = "nightly-2025-01-09";
+              package = dylintLib.cargo-dylint-general;
+            }
           ];
-        };
+          dylint = dylintLib.mkDylint { inherit lints; };
+        in
+        {
 
-        rustTarget = pkgs.rust-bin.stable.latest.default.override { };
+          devShells.default = pkgs.mkShell {
+            nativeBuildInputs = [
+              rustTarget
+              dylint
+            ];
+          };
+        }
+      )
+      // {
 
-        dylintLib = import ./mk-lib.nix {
-          inherit pkgs;
-          inherit (inputs) crane;
-        };
-
-        lints = [
-          {
-            toolchain = "nightly-2025-01-09";
-            package = dylintLib.cargo-dylint-general;
-          }
-        ];
-        dylint = dylintLib.mkDylint { inherit lints; };
-      in
-      {
         mkLib = import ./mk-lib.nix;
-
-        devShells.default = pkgs.mkShell {
-          nativeBuildInputs = [
-            rustTarget
-            dylint
-          ];
-        };
       }
     );
 }