Commit 7cdd1f3e authored by apfelkuchen06's avatar apfelkuchen06
Browse files

libnvme: fix cross 

without this, pkgsCross.armv7l-hf-multiplatform.libnvme fails to build with

[93/811] Compiling C object libnvme/_nvme.cpython-310-x86_64-linux-gnu.so.p/meson-generated_.._nvme_wrap.c.o
FAILED: libnvme/_nvme.cpython-310-x86_64-linux-gnu.so.p/meson-generated_.._nvme_wrap.c.o
armv7l-unknown-linux-gnueabihf-gcc -Ilibnvme/_nvme.cpython-310-x86_64-linux-gnu.so.p -Ilibnvme -I../libnvme -I. -I.. -Iccan -I../ccan -Isrc -I../src -Iinternal -I../internal -I/nix/store/fg4hibxylq2lhfc2xx2asaih8c02c77m-json-c-armv7l-unknown-linux-gnueabihf-0.16-dev/include -I/nix/store/fg4hibxylq2lhfc2xx2asaih8c02c77m-json-c-armv7l-unknown-linux-gnueabihf-0.16-dev/include/json-c -I/nix/store/fdqpyj613dr0v1l1lrzqhzay7sk4xg87-python3-3.10.10/include/python3.10 -fvisibility=hidden -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=gnu99 -fomit-frame-pointer -D_GNU_SOURCE -include internal/config.h -fPIC -MD -MQ libnvme/_nvme.cpython-310-x86_64-linux-gnu.so.p/meson-generated_.._nvme_wrap.c.o -MF libnvme/_nvme.cpython-310-x86_64-linux-gnu.so.p/meson-generated_.._nvme_wrap.c.o.d -o libnvme/_nvme.cpython-310-x86_64-linux-gnu.so.p/meson-generated_.._nvme_wrap.c.o -c libnvme/nvme_wrap.c
In file included from /nix/store/fdqpyj613dr0v1l1lrzqhzay7sk4xg87-python3-3.10.10/include/python3.10/Python.h:50,
                 from libnvme/nvme_wrap.c:149:
/nix/store/fdqpyj613dr0v1l1lrzqhzay7sk4xg87-python3-3.10.10/include/python3.10/pyport.h:746:2: error: #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)."
  746 | #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)."
      |  ^~~~~
parent 0c57b3ac

pkgs/os-specific/linux/libnvme/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec { 
    ninja

    perl # for kernel-doc

    pkg-config

    python3

    python3.pythonForBuild

    swig

  ];
@@ -46,6 +46,7 @@ stdenv.mkDerivation rec { 
    json_c

    openssl

    systemd

    python3

  ];



  mesonFlags = [