diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2024-02-24 16:36:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-24 16:36:39 +0100 |
| commit | 047d6e0a2f795cbf4157bd9b6f1cfedfeccbfe76 (patch) | |
| tree | 7a75c7a6744176036dc419e616c360d703f33072 /pkgs/tools/package-management | |
| parent | a1f6bb2b24f3c84290785237fb674f69fd36b459 (diff) | |
| parent | e9e2111b284ac8a212efbe79e7c3c4ef3abb3d40 (diff) | |
| download | nixlib-047d6e0a2f795cbf4157bd9b6f1cfedfeccbfe76.tar nixlib-047d6e0a2f795cbf4157bd9b6f1cfedfeccbfe76.tar.gz nixlib-047d6e0a2f795cbf4157bd9b6f1cfedfeccbfe76.tar.bz2 nixlib-047d6e0a2f795cbf4157bd9b6f1cfedfeccbfe76.tar.lz nixlib-047d6e0a2f795cbf4157bd9b6f1cfedfeccbfe76.tar.xz nixlib-047d6e0a2f795cbf4157bd9b6f1cfedfeccbfe76.tar.zst nixlib-047d6e0a2f795cbf4157bd9b6f1cfedfeccbfe76.zip | |
Merge pull request #289967 from fgaz/nix/riscv-enable-docs
nix: Revert "disable documentation on risc-v"
Diffstat (limited to 'pkgs/tools/package-management')
| -rw-r--r-- | pkgs/tools/package-management/nix/common.nix | 8 |
1 files changed, 1 insertions, 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 |