Unverified Commit b62edf00 authored by Luke Granger-Brown's avatar Luke Granger-Brown Committed by GitHub
Browse files

envoy: switch default WASM runtime to wasmtime (#435633)

parents 507f4945 f89b85d6

pkgs/by-name/en/envoy/bazel_nix.BUILD.bazel

+16 −2
Original line number Diff line number Diff line 
load("@bazel_tools//tools/sh:sh_toolchain.bzl", "sh_toolchain")

load("@rules_rust//rust:toolchain.bzl", "rust_toolchain")

load("@rules_rust//rust:defs.bzl", "rust_stdlib_filegroup")



toolchains = {

    "x86_64": "x86_64-unknown-linux-gnu",

    "aarch64": "aarch64-unknown-linux-gnu",

}



exports_files(["cargo", "rustdoc", "ruststd", "rustc"])

exports_files(["cargo", "rustdoc", "rustc"])



[

    rust_stdlib_filegroup(

        name = "rust_nix_" + k + "_stdlib",

        srcs = glob(

            [

                "rustcroot/lib/rustlib/" + v + "/lib/**",

            ],

            allow_empty=True,

        ),

    )

    for k, v in toolchains.items()

]



[

    rust_toolchain(
@@ -16,7 +30,7 @@ exports_files(["cargo", "rustdoc", "ruststd", "rustc"]) 
        exec_triple = v,

        cargo = ":cargo",

        rust_doc = ":rustdoc",

        rust_std = ":ruststd",

        rust_std = ":rust_nix_" + k + "_stdlib",

        rustc = ":rustc",

        stdlib_linkflags = ["-ldl", "-lpthread"],

        staticlib_ext = ".a",

pkgs/by-name/en/envoy/package.nix

+19 −9
Original line number Diff line number Diff line
@@ -23,9 +23,14 @@ 
  gnutar,

  gnugrep,

  envoy,

  git,



  # v8 (upstream default), wavm, wamr, wasmtime, disabled

  wasmRuntime ? "wamr",

  wasmRuntime ? "wasmtime",



  # Allows overriding the deps hash used for building - you will likely need to

  # set this if you have changed the 'wasmRuntime' setting.

  depsHash ? null,

}:



let
@@ -40,10 +45,13 @@ let 
  };



  # these need to be updated for any changes to fetchAttrs

  depsHash =

  depsHash' =

    if depsHash != null then

      depsHash

    else

      {

      x86_64-linux = "sha256-E6yUSd00ngmjaMds+9UVZLtcYhzeS8F9eSIkC1mZSps=";

      aarch64-linux = "sha256-ivboOrV/uORKVHRL3685aopcElGvzsxgVcUmYsBwzXY=";

        x86_64-linux = "sha256-t4Xv4UGYW5YU0kmv+1rdf2JvM1BYQyNWdtpz6Cdmxm4=";

        aarch64-linux = "sha256-aIBnNGzc0hTdlTgRyJ7eLnWvHqZ5ywhqOM+mHfH3/18=";

      }

      .${stdenv.system} or (throw "unsupported system ${stdenv.system}");
@@ -94,7 +102,7 @@ buildBazelPackage rec { 
    ln -sf "${cargo}/bin/cargo" bazel/nix/cargo

    ln -sf "${rustc}/bin/rustc" bazel/nix/rustc

    ln -sf "${rustc}/bin/rustdoc" bazel/nix/rustdoc

    ln -sf "${rustPlatform.rustLibSrc}" bazel/nix/ruststd

    ln -sf "${rustc.unwrapped}" bazel/nix/rustcroot

    substituteInPlace bazel/dependency_imports.bzl \

      --replace-fail 'crate_universe_dependencies()' 'crate_universe_dependencies(rust_toolchain_cargo_template="@@//bazel/nix:cargo", rust_toolchain_rustc_template="@@//bazel/nix:rustc")' \

      --replace-fail 'crates_repository(' 'crates_repository(rust_toolchain_cargo_template="@@//bazel/nix:cargo", rust_toolchain_rustc_template="@@//bazel/nix:rustc",'
@@ -120,12 +128,13 @@ buildBazelPackage rec { 
    ninja

    patchelf

    cacert

    git

  ];



  buildInputs = [ linuxHeaders ];



  fetchAttrs = {

    sha256 = depsHash;

    sha256 = depsHash';

    env.CARGO_BAZEL_REPIN = true;

    dontUseCmakeConfigure = true;

    dontUseGnConfigure = true;
@@ -239,6 +248,7 @@ buildBazelPackage rec { 
    "--linkopt=-Wl,-z,noexecstack"

    "--config=gcc"

    "--verbose_failures"

    "--incompatible_enable_cc_toolchain_resolution=true"



    # Force use of system Java.

    "--extra_toolchains=@local_jdk//:all"