diff options
author | Peder Bergebakken Sundt <pbsds@hotmail.com> | 2023-08-07 19:00:05 +0200 |
---|---|---|
committer | Yt <happysalada@tuta.io> | 2023-09-18 08:13:58 +0000 |
commit | 187afc5d1bd84226dd9b89da3e8a2e6ab4eb4274 (patch) | |
tree | 36aa83001294d2140563f464f5755636d5520867 /pkgs/servers/ldap | |
parent | 5fcc0209794a34f0661ab4b852f05f38965a4d84 (diff) |
rustc-wasm32: init at 1.70.0
Diffstat (limited to 'pkgs/servers/ldap')
-rw-r--r-- | pkgs/servers/ldap/lldap/default.nix | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/pkgs/servers/ldap/lldap/default.nix b/pkgs/servers/ldap/lldap/default.nix index d75918936815b..ac55ac025d135 100644 --- a/pkgs/servers/ldap/lldap/default.nix +++ b/pkgs/servers/ldap/lldap/default.nix @@ -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 = '' |