From ff1752c3aea19d4b702fcbe2b8d347961b363084 Mon Sep 17 00:00:00 2001 From: Alexey Orlenko Date: Fri, 1 Dec 2023 16:58:16 +0100 Subject: [PATCH] nix: add wasm tooling to the default dev shell (#4495) --- nix/all-engines.nix | 2 +- nix/args.nix | 4 +++- nix/shell.nix | 11 ++++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/nix/all-engines.nix b/nix/all-engines.nix index 0e6a1c05b23..d432afd2441 100644 --- a/nix/all-engines.nix +++ b/nix/all-engines.nix @@ -15,7 +15,7 @@ let src = srcPath; name = "prisma-engines-source"; }; - craneLib = (flakeInputs.crane.mkLib pkgs).overrideToolchain rustToolchain.default; + craneLib = (flakeInputs.crane.mkLib pkgs).overrideToolchain rustToolchain; deps = craneLib.vendorCargoDeps { inherit src; }; libSuffix = stdenv.hostPlatform.extensions.sharedLibrary; in diff --git a/nix/args.nix b/nix/args.nix index 2254b7f5b13..352d07fd584 100644 --- a/nix/args.nix +++ b/nix/args.nix @@ -8,6 +8,8 @@ in rec { pkgs = import flakeInputs.nixpkgs { inherit system overlays; }; - rustToolchain = pkgs.rust-bin.stable.latest; + rustToolchain = pkgs.rust-bin.stable.latest.default.override { + targets = ["wasm32-unknown-unknown"]; + }; }; } diff --git a/nix/shell.nix b/nix/shell.nix index 94661c972d0..8cde4e9c4a7 100644 --- a/nix/shell.nix +++ b/nix/shell.nix @@ -1,19 +1,24 @@ { self', pkgs, rustToolchain, ... }: let - devToolchain = rustToolchain.default.override { extensions = [ "rust-analyzer" "rust-src" ]; }; + devToolchain = rustToolchain.override { extensions = [ "rust-analyzer" "rust-src" ]; }; nodejs = pkgs.nodejs_latest; in { devShells.default = pkgs.mkShell { - packages = [ + packages = with pkgs; [ devToolchain - pkgs.llvmPackages_latest.bintools + llvmPackages_latest.bintools nodejs nodejs.pkgs.typescript-language-server nodejs.pkgs.pnpm + + jq + wasm-bindgen-cli + wasm-pack ]; + inputsFrom = [ self'.packages.prisma-engines ]; shellHook = pkgs.lib.optionalString pkgs.stdenv.isLinux "export RUSTFLAGS='-C link-arg=-fuse-ld=lld'";