From e9e2111b284ac8a212efbe79e7c3c4ef3abb3d40 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 19 Feb 2024 15:13:29 +0100 Subject: [PATCH] nix: Revert "disable documentation on risc-v" This reverts commit 95c77f3af9b805da516e34c9ec08b216b95b8146. rustc now uses LLVM 17 which includes the bugfix this was blocked on. --- pkgs/tools/package-management/nix/common.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index f53adfa8a085..cab48bbaf5b6 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -56,13 +56,7 @@ in , util-linuxMinimal , xz -, enableDocumentation ? !atLeast24 || ( - (stdenv.hostPlatform == stdenv.buildPlatform) && - # mdbook errors out on risc-v due to a rustc bug - # https://github.com/NixOS/nixpkgs/pull/242019 - # https://github.com/rust-lang/rust/issues/114473 - !stdenv.buildPlatform.isRiscV - ) +, enableDocumentation ? !atLeast24 || stdenv.hostPlatform == stdenv.buildPlatform , enableStatic ? stdenv.hostPlatform.isStatic , withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp , withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp, libseccomp