gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libnvme: add withDocs

Browse Source 
The libnvme documentation fails to build when cross compiling, with:

 FAILED: doc/nvme_admin_opcode.2
 /nix/store/qcvcsink30f4wh36jzg3rbvkshwzj38c-meson-1.1.1/bin/meson --internal exe --capture doc/nvme_admin_opcode.2 -- /build/source/doc/kernel-doc -module libnvme -man -function nvme_admin_opcode ../doc/../src/nvme/types.h
 Traceback (most recent call last):
   File "/nix/store/qcvcsink30f4wh36jzg3rbvkshwzj38c-meson-1.1.1/bin/meson", line 6, in <module>
   File "/nix/store/qcvcsink30f4wh36jzg3rbvkshwzj38c-meson-1.1.1/lib/python3.10/site-packages/mesonbuild/mesonmain.py", line 30, in <module>
     from . import mlog
 ImportError: cannot import name 'mlog' from 'mesonbuild' (/nix/store/qcvcsink30f4wh36jzg3rbvkshwzj38c-meson-1.1.1/lib/python3.10/site-packages/mesonbuild/__init__.py)
 [703/811] Generating doc/nvme_identify_cns_man with a custom command (wrapped by meson to capture output)
 FAILED: doc/nvme_identify_cns.2
 /nix/store/qcvcsink30f4wh36jzg3rbvkshwzj38c-meson-1.1.1/bin/meson --internal exe --capture doc/nvme_identify_cns.2 -- /build/source/doc/kernel-doc -module libnvme -man -function nvme_identify_cns ../doc/../src/nvme/types.h
 Traceback (most recent call last):
   File "/nix/store/qcvcsink30f4wh36jzg3rbvkshwzj38c-meson-1.1.1/bin/meson", line 6, in <module>
   File "/nix/store/qcvcsink30f4wh36jzg3rbvkshwzj38c-meson-1.1.1/lib/python3.10/site-packages/mesonbuild/mesonmain.py", line 30, in <module>
     from . import mlog
This commit is contained in:
Adam Joseph
2023-08-28 22:13:34 +03:00
committed by Artturin
parent 074dea1e11
commit 3901f0c853
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/libnvme/default.nix
+4 -2
View File
@@ -11,13 +11,15 @@
, stdenv
, swig
, systemd
# ImportError: cannot import name 'mlog' from 'mesonbuild'
, withDocs ? stdenv.hostPlatform.canExecute stdenv.buildPlatform
}:
stdenv.mkDerivation rec {
pname = "libnvme";
version = "1.4";
outputs = [ "out" "man" ];
outputs = [ "out" ] ++ lib.optionals withDocs [ "man" ];
src = fetchFromGitHub {
owner = "linux-nvme";
@@ -51,7 +53,7 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Ddocs=man"
"-Ddocs-build=true"
(lib.mesonBool "docs-build" withDocs)
];
preConfigure = ''