git.fiddlerwoaroof.com
Browse code

chore(nix): improve flake for cross-platform usage

Edward Langley authored on 27/03/2022 10:31:26
Showing 2 changed files
flake.lock
History View file @ 06f8984
... ... 
@@ -17,6 +17,21 @@
17 17 
       }
18 18 
     },
19 19 
     "flake-utils": {
20 
+      "locked": {
21 
+        "lastModified": 1648297722,
22 
+        "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
23 
+        "owner": "numtide",
24 
+        "repo": "flake-utils",
25 
+        "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade",
26 
+        "type": "github"
27 
+      },
28 
+      "original": {
29 
+        "owner": "numtide",
30 
+        "repo": "flake-utils",
31 
+        "type": "github"
32 
+      }
33 
+    },
34 
+    "flake-utils_2": {
20 35 
       "locked": {
21 36 
         "lastModified": 1629481132,
22 37 
         "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
... ... 
@@ -66,13 +81,14 @@
66 81 
     "root": {
67 82 
       "inputs": {
68 83 
         "flake-compat": "flake-compat",
84 
+        "flake-utils": "flake-utils",
69 85 
         "nixpkgs": "nixpkgs",
70 86 
         "zig": "zig"
71 87 
       }
72 88 
     },
73 89 
     "zig": {
74 90 
       "inputs": {
75 
-        "flake-utils": "flake-utils",
91 
+        "flake-utils": "flake-utils_2",
76 92 
         "nixpkgs": "nixpkgs_2"
77 93 
       },
78 94 
       "locked": {
flake.nix
History View file @ 06f8984
... ... 
@@ -11,6 +11,7 @@
11 11 
       url = "github:edolstra/flake-compat";
12 12 
       flake = false;
13 13 
     };
14 
+    flake-utils.url = "github:numtide/flake-utils";
14 15 
   };
15 16
16 17 
   outputs = {
... ... 
@@ -18,13 +19,15 @@
18 19 
     nixpkgs,
19 20 
     zig,
20 21 
     flake-compat,
21 
-  }: let
22 
-    pkgs = nixpkgs.legacyPackages.aarch64-darwin;
23 
-    zig091 = zig.packages.aarch64-darwin."0.9.1";
24 
-  in
25 
-    {
26 
-      devShell.aarch64-darwin = pkgs.mkShell {
27 
-        buildInputs = [zig091 nixpkgs.legacyPackages.aarch64-darwin.socat];
22 
+    flake-utils,
23 
+  }:
24 
+    flake-utils.lib.eachDefaultSystem (system: let
25 
+      pkgs = nixpkgs.legacyPackages.${system};
26 
+      zig091 = zig.packages.${system}."0.9.1";
27 
+      socat = pkgs.socat;
28 
+    in {
29 
+      devShell = pkgs.mkShell {
30 
+        buildInputs = [zig091 socat];
28 31 
       };
29 
-    };
32 
+    });
30 33 
 }