diff options
| -rw-r--r-- | pkgs/servers/ldap/lldap/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 16 |
2 files changed, 18 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 = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4774c4f1b7962..7dc94d9a8634a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |