From bfc7f49a039fe853fde3da7d960a66a509ac94df Mon Sep 17 00:00:00 2001 From: oppiliappan Date: Mon, 22 Jun 2026 11:19:23 +0100 Subject: [PATCH] nix: get devshell working on darwin Signed-off-by: oppiliappan --- flake.lock | 6 ++--- flake.nix | 79 ++++++++++++++++++++++++++++-------------------------- 2 files changed, 44 insertions(+), 41 deletions(-) diff --git a/flake.lock b/flake.lock index 45dc1eef..0d1eecb1 100644 --- a/flake.lock +++ b/flake.lock @@ -117,14 +117,14 @@ "ibm-plex-mono-src": { "flake": false, "locked": { - "lastModified": 1731402378, + "lastModified": 1731402384, "narHash": "sha256-OwUmrPfEehLDz0fl2ChYLK8FQM2p0G1+EMrGsYEq+6g=", "type": "tarball", - "url": "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip" + "url": "https://github.com/IBM/plex/releases/download/@ibm%2Fplex-mono@1.1.0/ibm-plex-mono.zip" }, "original": { "type": "tarball", - "url": "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip" + "url": "https://github.com/IBM/plex/releases/download/@ibm%2Fplex-mono@1.1.0/ibm-plex-mono.zip" } }, "indigo": { diff --git a/flake.nix b/flake.nix index 2bad35f3..5b6afa67 100644 --- a/flake.nix +++ b/flake.nix @@ -292,44 +292,47 @@ }); in { default = staticShell { - nativeBuildInputs = [ - pkgs.go - pkgs.air - pkgs.gopls - pkgs.httpie - pkgs.litecli - pkgs.websocat - pkgs.tailwindcss - pkgs.nixos-shell - pkgs.redis - pkgs.worker-build - pkgs.cargo-generate - pkgs.qemu - pkgs.cdrkit - pkgs.parted - pkgs.buf - pkgs.protobuf - pkgs.protoc-gen-prost - pkgs.protoc-gen-prost-crate - pkgs.protoc-gen-prost-serde - pkgs.protoc-gen-go - (fenix.packages.${system}.combine [ - fenix.packages.${system}.stable.cargo - fenix.packages.${system}.stable.rustc - fenix.packages.${system}.stable.rust-src - fenix.packages.${system}.stable.clippy - fenix.packages.${system}.stable.rustfmt - fenix.packages.${system}.targets.wasm32-unknown-unknown.stable.rust-std - ]) - pkgs.coreutils # for those of us who are on systems that use busybox (alpine) - packages'.lexgen - packages'.treefmt-wrapper - packages'.tap - pkgs.e2fsprogs - pkgs.slirp4netns - pkgs.iproute2 - pkgs.util-linux - ]; + nativeBuildInputs = + [ + pkgs.go + pkgs.air + pkgs.gopls + pkgs.httpie + pkgs.litecli + pkgs.websocat + pkgs.tailwindcss + pkgs.nixos-shell + pkgs.redis + pkgs.worker-build + pkgs.cargo-generate + pkgs.qemu + pkgs.cdrkit + pkgs.buf + pkgs.protobuf + pkgs.protoc-gen-prost + pkgs.protoc-gen-prost-crate + pkgs.protoc-gen-prost-serde + pkgs.protoc-gen-go + (fenix.packages.${system}.combine [ + fenix.packages.${system}.stable.cargo + fenix.packages.${system}.stable.rustc + fenix.packages.${system}.stable.rust-src + fenix.packages.${system}.stable.clippy + fenix.packages.${system}.stable.rustfmt + fenix.packages.${system}.targets.wasm32-unknown-unknown.stable.rust-std + ]) + pkgs.coreutils # for those of us who are on systems that use busybox (alpine) + packages'.lexgen + packages'.treefmt-wrapper + packages'.tap + pkgs.e2fsprogs + pkgs.util-linux + ] + ++ pkgs.lib.optionals pkgs.stdenv.isLinux [ + pkgs.parted + pkgs.slirp4netns + pkgs.iproute2 + ]; shellHook = '' mkdir -p appview/pages/static # temporary self-heal for workspaces that copied static assets as read-only -- 2.51.2