diff options
| -rw-r--r-- | pkgs/applications/blockchains/polkadot/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/misc/pagefind/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/compilers/rust/rustc.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/ldap/lldap/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 13 |
6 files changed, 14 insertions, 21 deletions
diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index e1b042aadbb6..42662d0ededf 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -4,7 +4,7 @@ , rocksdb , rust-jemalloc-sys-unprefixed , rustPlatform -, rustc-wasm32 +, rustc , stdenv , Security , SystemConfiguration @@ -61,8 +61,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ rustPlatform.bindgenHook - rustc-wasm32 - rustc-wasm32.llvmPackages.lld + rustc + rustc.llvmPackages.lld ]; # NOTE: jemalloc is used by default on Linux with unprefixed enabled diff --git a/pkgs/applications/misc/pagefind/default.nix b/pkgs/applications/misc/pagefind/default.nix index 06f62da1ffb6..1d1a91e9e4b5 100644 --- a/pkgs/applications/misc/pagefind/default.nix +++ b/pkgs/applications/misc/pagefind/default.nix @@ -7,7 +7,7 @@ , binaryen , gzip , nodejs -, rustc-wasm32 +, rustc , wasm-bindgen-cli , wasm-pack }: @@ -66,8 +66,8 @@ rustPlatform.buildRustPackage rec { binaryen gzip nodejs - rustc-wasm32 - rustc-wasm32.llvmPackages.lld + rustc + rustc.llvmPackages.lld wasm-bindgen-84 wasm-pack ]; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 7e365f52ef30..697770a86088 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -65,6 +65,8 @@ in stdenv.mkDerivation (finalAttrs: { # Increase codegen units to introduce parallelism within the compiler. RUSTFLAGS = "-Ccodegen-units=10"; + RUSTDOCFLAGS = "-A rustdoc::broken-intra-doc-links"; + # We need rust to build rust. If we don't provide it, configure will try to download it. # Reference: https://github.com/rust-lang/rust/blob/master/src/bootstrap/configure.py configureFlags = let @@ -100,6 +102,10 @@ in stdenv.mkDerivation (finalAttrs: { "--target=${concatStringsSep "," ([ stdenv.targetPlatform.rust.rustcTargetSpec + # Other targets that don't need any extra dependencies to build. + ] ++ optionals (!fastCross) [ + "wasm32-unknown-unknown" + # (build!=target): When cross-building a compiler we need to add # the build platform as well so rustc can compile build.rs # scripts. diff --git a/pkgs/servers/ldap/lldap/default.nix b/pkgs/servers/ldap/lldap/default.nix index ac55ac025d13..892fa3a10c36 100644 --- a/pkgs/servers/ldap/lldap/default.nix +++ b/pkgs/servers/ldap/lldap/default.nix @@ -7,7 +7,6 @@ , nixosTests , rustPlatform , rustc -, rustc-wasm32 , stdenv , wasm-bindgen-cli , wasm-pack @@ -48,7 +47,7 @@ let pname = commonDerivationAttrs.pname + "-frontend"; nativeBuildInputs = [ - wasm-pack wasm-bindgen-84 binaryen which rustc-wasm32 rustc-wasm32.llvmPackages.lld + wasm-pack wasm-bindgen-84 binaryen which rustc rustc.llvmPackages.lld ]; buildPhase = '' diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e033a5c3a65c..ea00c90a4f3d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -829,6 +829,7 @@ mapAliases ({ rtsp-simple-server = throw "rtsp-simple-server is rebranded as mediamtx, including default config path update"; # Added 2023-04-11 runCommandNoCC = runCommand; runCommandNoCCLocal = runCommandLocal; + rustc-wasm32 = rustc; # Added 2023-12-01 rxvt_unicode = rxvt-unicode-unwrapped; # Added 2020-02-02 rxvt_unicode-with-plugins = rxvt-unicode; # Added 2020-02-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76969d71fac1..4e2bb8927ee3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16925,19 +16925,6 @@ with pkgs; inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform; - # https://github.com/NixOS/nixpkgs/issues/89426 - rustc-wasm32 = wrapRustc ((rustc.unwrapped.override { - stdenv = stdenv.override { - targetPlatform = lib.systems.elaborate { - # lib.systems.elaborate won't recognize "unknown" as the last component. - config = "wasm32-unknown-wasi"; - rust.rustcTarget = "wasm32-unknown-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 { }; |