diff options
| author | Rahul Butani <rrbutani@users.noreply.github.com> | 2022-10-07 22:45:21 -0500 |
|---|---|---|
| committer | Rahul Butani <rrbutani@users.noreply.github.com> | 2023-01-27 13:29:22 -0800 |
| commit | 19d1571ee46eca979011db5010b9d4fcc2731cd8 (patch) | |
| tree | caf3a2964b23747d76c991922967b64a0602ed63 /pkgs/development/compilers | |
| parent | b4ee532f360090c3ed3277e7224763bd6429b412 (diff) | |
| download | nixlib-19d1571ee46eca979011db5010b9d4fcc2731cd8.tar nixlib-19d1571ee46eca979011db5010b9d4fcc2731cd8.tar.gz nixlib-19d1571ee46eca979011db5010b9d4fcc2731cd8.tar.bz2 nixlib-19d1571ee46eca979011db5010b9d4fcc2731cd8.tar.lz nixlib-19d1571ee46eca979011db5010b9d4fcc2731cd8.tar.xz nixlib-19d1571ee46eca979011db5010b9d4fcc2731cd8.tar.zst nixlib-19d1571ee46eca979011db5010b9d4fcc2731cd8.zip | |
llvmPackages_15.lldb: fix the manpages
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/llvm/15/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/15/lldb/default.nix | 7 |
2 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/development/compilers/llvm/15/default.nix b/pkgs/development/compilers/llvm/15/default.nix index 8825f860c616..b729616843d2 100644 --- a/pkgs/development/compilers/llvm/15/default.nix +++ b/pkgs/development/compilers/llvm/15/default.nix @@ -88,11 +88,10 @@ let python3 = pkgs.python3; # don't use python-boot }); - # Needs package for spinhx-automodapi: https://github.com/astropy/sphinx-automodapi - # lldb-manpages = lowPrio (tools.lldb.override { - # enableManpages = true; - # python3 = pkgs.python3; # don't use python-boot - # }); + lldb-manpages = lowPrio (tools.lldb.override { + enableManpages = true; + python3 = pkgs.python3; # don't use python-boot + }); # pick clang appropriate for package set we are targeting clang = diff --git a/pkgs/development/compilers/llvm/15/lldb/default.nix b/pkgs/development/compilers/llvm/15/lldb/default.nix index 1ceca3813fa4..2b1b377abe5a 100644 --- a/pkgs/development/compilers/llvm/15/lldb/default.nix +++ b/pkgs/development/compilers/llvm/15/lldb/default.nix @@ -116,6 +116,13 @@ stdenv.mkDerivation (rec { "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" + + # docs reference `automodapi` but it's not added to the extensions list when + # only building the manpages: + # https://github.com/llvm/llvm-project/blob/af6ec9200b09039573d85e349496c4f5b17c3d7f/lldb/docs/conf.py#L54 + # + # so, we just ignore the resulting errors + "-DSPHINX_WARNINGS_AS_ERRORS=OFF" ] ++ lib.optionals doCheck [ "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" |