1
0
Fork 0
www/patches/f23952856444fe39fad622a0db9...

83 lines
2.6 KiB
Diff
Raw Normal View History

2023-09-17 00:24:51 +00:00
From f23952856444fe39fad622a0db9eae55cd0f6fe8 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 7 Aug 2023 19:00:05 +0200
Subject: [PATCH] rustc-wasm32: init at 1.70.0
---
pkgs/servers/ldap/lldap/default.nix | 20 ++------------------
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 44678a71db1ea..3527f33f060dc 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=";
@@ -71,7 +55,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 b9bb66eb682fa..8e9cddabc6fa3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16864,6 +16864,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 { };