Unverified Commit ab0af326 authored by Alyssa Ross's avatar Alyssa Ross
Browse files

Revert "qemu: fix build w/glibc-2.33" 

This reverts commit 04be5ced.

Builds fine without the change now, so presumably either Glibc, QEMU,
or both, fixed this in the meantime.
parent 12a73604

pkgs/applications/virtualization/qemu/default.nix

+0 −12
Original line number Diff line number Diff line
@@ -133,18 +133,6 @@ stdenv.mkDerivation rec { 
    # Otherwise tries to ensure /var/run exists.

    sed -i "/install_subdir('run', install_dir: get_option('localstatedir'))/d" \

        qga/meson.build



    # glibc 2.33 compat fix: if `has_statx = true` is set, `tools/virtiofsd/passthrough_ll.c` will

    # rely on `stx_mnt_id`[1] which is not part of glibc's `statx`-struct definition.

    #

    # `has_statx` will be set to `true` if a simple C program which uses a few `statx`

    # consts & struct fields successfully compiles. It seems as this only builds on glibc-2.33

    # since most likely[2] and because of that, the problematic code-path will be used.

    #

    # [1] https://github.com/torvalds/linux/commit/fa2fcf4f1df1559a0a4ee0f46915b496cc2ebf60#diff-64bab5a0a3fcb55e1a6ad77b1dfab89d2c9c71a770a07ecf44e6b82aae76a03a

    # [2] https://sourceware.org/git/?p=glibc.git;a=blobdiff;f=io/bits/statx-generic.h;h=c34697e3c1fd79cddd60db294302e461ed8db6e2;hp=7a09e94be2abb92d2df612090c132e686a24d764;hb=88a2cf6c4bab6e94a65e9c0db8813709372e9180;hpb=c4e4b2e149705559d28b16a9b47ba2f6142d6a6c

    substituteInPlace meson.build \

      --replace 'has_statx = cc.links(statx_test)' 'has_statx = false'

  '';



  preConfigure = ''