Commit 187afc5d authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by Yt
Browse files

rustc-wasm32: init at 1.70.0

parent 5fcc0209

pkgs/servers/ldap/lldap/default.nix

+2 −18
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
, nixosTests

, rustPlatform

, rustc

, rustc-wasm32

, stdenv

, wasm-bindgen-cli

, wasm-pack
@@ -15,23 +16,6 @@ 


let



  # replace with upstream wasm rustc, after resolution of

  # https://github.com/NixOS/nixpkgs/issues/89426

  rustc-wasm = (rustc.override {

    stdenv = stdenv.override {

      targetPlatform = stdenv.targetPlatform // {

        parsed = {

          cpu.name = "wasm32";

          vendor.name = "unknown";

          kernel.name = "unknown";

          abi.name = "unknown";

        };

      };

    };

  }).overrideAttrs (attrs: {

    configureFlags = attrs.configureFlags ++ ["--set=build.docs=false"];

  });



  wasm-bindgen-84 = wasm-bindgen-cli.override {

    version = "0.2.84";

    hash = "sha256-0rK+Yx4/Jy44Fw5VwJ3tG243ZsyOIBBehYU54XP/JGk=";
@@ -64,7 +48,7 @@ let 
    pname = commonDerivationAttrs.pname + "-frontend";



    nativeBuildInputs = [

      wasm-pack wasm-bindgen-84 binaryen which rustc-wasm rustc-wasm.llvmPackages.lld

      wasm-pack wasm-bindgen-84 binaryen which rustc-wasm32 rustc-wasm32.llvmPackages.lld

    ];



    buildPhase = ''

pkgs/top-level/all-packages.nix

+16 −0
Original line number Diff line number Diff line
@@ -17165,6 +17165,22 @@ with pkgs; 














  inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform;



























  # https://github.com/NixOS/nixpkgs/issues/89426













  rustc-wasm32 = (rustc.override {













    stdenv = stdenv.override {













      targetPlatform = stdenv.targetPlatform // {













        parsed = {













          cpu.name = "wasm32";













          vendor.name = "unknown";













          kernel.name = "unknown";













          abi.name = "unknown";













        };













      };













    };













  }).overrideAttrs (old: {













    configureFlags = old.configureFlags ++ ["--set=build.docs=false"];













  });



























  makeRustPlatform = callPackage ../development/compilers/rust/make-rust-platform.nix { };





























  buildRustCrate = callPackage ../build-support/rust/build-rust-crate { };