1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-04 03:25:02 +00:00
nixpkgs/pkgs
Will Dietz 3d4aa7e95d qemu: workaround 'struct sysinfo' conflict musl <--> linux
Most everyone using musl patches the linux headers instead,
but various software uses a local workaround like the
one added in this commit (psutils, for example).

It's not obvious to me which project has the "bug",
and I'm reluctant to even propose modifying our headers
without clear answer on the issue.

Also, modifying those headers triggers rebuild-all-the-things.

Hopefully upstream projects sort this out, in the meantime
adding this define is a bit of a kludge but does the job.

-------

For the curious, the patch usually is something like this:
https://patchwork.kernel.org/patch/3833241/

Here's an updated version that also ensures
kernel users get the sysinfo struct as expected too:
https://raw.githubusercontent.com/openwrt/openwrt/e3c43ade0bae9491aeea50fa361e846bb5002dc0/target/linux/generic/pending-4.14/270-uapi-kernel.h-glibc-specific-inclusion-of-sysinfo.h.patch

(cherry picked from commit dtzWill/nixpkgs@91b5f5a463)
2018-04-26 17:58:16 +02:00
..
applications qemu: workaround 'struct sysinfo' conflict musl <--> linux 2018-04-26 17:58:16 +02:00
build-support treewide: isArm -> isAarch32 2018-04-25 15:28:55 -04:00
common-updater
data all-cabal-hashes: update to latest version 2018-04-25 11:43:55 +02:00
desktops rarian: merge gnome{2,3}.rarian 2018-04-25 15:53:26 +02:00
development rubycop: 0.47.0 -> 0.55.0 2018-04-25 22:15:44 +01:00
games openarena: needs libcurl for fast assets downloads 2018-04-24 17:06:58 +02:00
misc vim-nix: 2018-04-15 -> 2018-04-24 2018-04-25 18:48:16 +02:00
os-specific treewide: isArm -> isAarch32 2018-04-25 15:28:55 -04:00
servers treewide: isArm -> isAarch32 2018-04-25 15:28:55 -04:00
shells nix-bash-completions: 0.6.5 -> 0.6.6 2018-04-25 11:19:51 +02:00
stdenv treewide: isArm -> isAarch32 2018-04-25 15:28:55 -04:00
test
tools Merge pull request #36055 from ryantm/auto-update/thin-provisioning-tools-0.6.3-to-0.7.5 2018-04-25 14:48:56 -05:00
top-level Merge pull request #35187 from xurei/app/yarssr 2018-04-25 14:47:08 -05:00