fix nix dev shell on darwin (#35278)

2025-08-18 22:54:17 +09:00 · 2025-08-14 14:39:38 -04:00
parent 4ff8cdf826
commit d9a2dfd95e
2 changed files with 43 additions and 31 deletions
--- a/flake.lock
+++ b/flake.lock
@ -20,11 +20,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1752480373,
-        "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=",
+        "lastModified": 1755027561,
+        "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08",
+        "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -18,38 +18,50 @@
            go = go_1_24;
            nodejs = nodejs_24;
            python3 = python312;
-          in
-          pkgs.mkShell {
-            buildInputs = [
-              # generic
-              git
-              git-lfs
-              gnumake
-              gnused
-              gnutar
-              gzip

-              # frontend
-              nodejs
-
-              # linting
-              python3
-              uv
-
-              # backend
-              go
+            # Platform-specific dependencies
+            linuxOnlyInputs = lib.optionals pkgs.stdenv.isLinux [
              glibc.static
-              gofumpt
-              sqlite
            ];
-            CFLAGS = "-I${glibc.static.dev}/include";
-            LDFLAGS = "-L ${glibc.static}/lib";
-            GO = "${go}/bin/go";
-            GOROOT = "${go}/share/go";

-            TAGS = "sqlite sqlite_unlock_notify";
-            STATIC = "true";
-          };
+            linuxOnlyEnv = lib.optionalAttrs pkgs.stdenv.isLinux {
+              CFLAGS = "-I${glibc.static.dev}/include";
+              LDFLAGS = "-L ${glibc.static}/lib";
+            };
+          in
+          pkgs.mkShell (
+            {
+              buildInputs = [
+                # generic
+                git
+                git-lfs
+                gnumake
+                gnused
+                gnutar
+                gzip
+
+                # frontend
+                nodejs
+
+                # linting
+                python3
+                uv
+
+                # backend
+                go
+                gofumpt
+                sqlite
+              ]
+              ++ linuxOnlyInputs;
+
+              GO = "${go}/bin/go";
+              GOROOT = "${go}/share/go";
+
+              TAGS = "sqlite sqlite_unlock_notify";
+              STATIC = "true";
+            }
+            // linuxOnlyEnv
+          );
      }
    );
 }