From 6a6b981979bfd62d46eae40ef81831bd3b5c2741 Mon Sep 17 00:00:00 2001
From: StepBroBD <Hi@StepBroBD.com>
Date: Wed, 16 Aug 2023 14:29:39 -0400
Subject: [PATCH] Fix nix flake overlays (#236)

---
 flake.lock |  6 +++---
 flake.nix  | 23 +++++++++--------------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/flake.lock b/flake.lock
index 90e07bf..b9c63db 100644
--- a/flake.lock
+++ b/flake.lock
@@ -41,11 +41,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1685518550,
-        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
+        "lastModified": 1689068808,
+        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
+        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 2c297f7..2ca105a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,17 +4,12 @@
     utils.url = "flake:flake-utils";
   };
 
-  outputs = { self, nixpkgs, utils, ... }: utils.lib.eachSystem [
-    "aarch64-darwin"
-    "x86_64-darwin"
-    "aarch64-linux"
-    "x86_64-linux"
-  ]
+  outputs = { self, nixpkgs, utils }: utils.lib.eachDefaultSystem
     (system:
       let
-        pkgs = nixpkgs.legacyPackages.${system};
-        # enable musl on Linux makes the build time 100x slower
-        # since it will trigger a toolchain rebuild
+        # enable musl on Linux will trigger a toolchain rebuild
+        # making the build very slow
+        pkgs = import nixpkgs { inherit system; };
         # if nixpkgs.legacyPackages.${system}.stdenv.hostPlatform.isLinux
         # then nixpkgs.legacyPackages.${system}.pkgsMusl
         # else nixpkgs.legacyPackages.${system};
@@ -49,10 +44,6 @@
       {
         packages.default = crunchy-cli;
 
-        overlays.default = _: prev: {
-          crunchy-cli = prev.crunchy-cli.override { };
-        };
-
         devShells.default = pkgs.mkShell {
           packages = with pkgs; [
             cargo
@@ -77,5 +68,9 @@
 
         formatter = pkgs.nixpkgs-fmt;
       }
-    );
+    ) // {
+    overlays.default = final: prev: {
+      inherit (self.packages.${final.system}) crunchy-cli;
+    };
+  };
 }