Merge pull request #102 from jacekpoz/no-numtide

flake: remove numtide/flake-utils
gabm · Jul 14, 2024 · 84e6b1b · 84e6b1b
2 parents a272230 + a92852f
commit 84e6b1b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 54 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -4,22 +4,24 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     rust-overlay.url = "github:oxalica/rust-overlay";
-    flake-utils.url = "github:numtide/flake-utils";
   };
 
-  outputs = { self, nixpkgs, rust-overlay, flake-utils, ... }:
-    flake-utils.lib.eachDefaultSystem (system:
-      let
-        overlays = [ (import rust-overlay) ];
-        pkgs = import nixpkgs {
-          inherit system overlays;
-        };
-
-      in
-      with pkgs;
-      {
-        devShells.default = mkShell {
-          buildInputs = [
+  outputs = {
+    nixpkgs,
+    rust-overlay,
+    ...
+  }: let
+    systems = ["x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin"];
+    forEachSystem = nixpkgs.lib.genAttrs systems;
+  in {
+    devShells = forEachSystem (
+      system: let
+        overlays = [(import rust-overlay)];
+        pkgs = import nixpkgs {inherit system overlays;};
+      in rec {
+        default = satty;
+        satty = pkgs.mkShell {
+          buildInputs = with pkgs; [
             pkg-config
             libGL
             libepoxy
@@ -28,16 +30,16 @@
             libadwaita
             fontconfig
 
-            (rust-bin.stable.latest.default.override
-              {
-                extensions = [ "rust-src" ];
-              })
+            (rust-bin.stable.latest.default.override {
+              extensions = ["rust-src"];
+            })
           ];
 
-          shellHook = ''
+          shellHook = with pkgs; ''
             export GSETTINGS_SCHEMA_DIR=${glib.getSchemaPath gtk4}
           '';
         };
       }
     );
+  };
 }