android-tools: add patch to fix build against 6.0 kernel headers#196146
android-tools: add patch to fix build against 6.0 kernel headers#196146vcunat merged 1 commit intoNixOS:masterfrom yu-re-ka:staging-next-fix-android-tools
Conversation
|
Result of 2 packages built:
|
trofi
left a comment
There was a problem hiding this comment.
Is it an upstream patch? If not should it be forwarded there as well?
Agreed. If it's an upstream patch then |
|
Upstream merged a similar patch in the meantime: nmeum/android-tools#85 They're exactly the same, except they have additional diffs in |
|
I wrote this patch with the help of a friend. I did not get around to submitting it upstream, but if they already have an equivalent patch submitted there that's great too.
You overlooked that my patch adds the allocation/free of heap-allocated child structs to the constructor/destructor of usb_handle. This is cleaner than what they are doing because it makes it impossible to accidentally delete the usb_handle without freeing the child structs too. But well, theirs will probably work too (except for leaking memory in some failure cases). |
|
Oh right, I did overlook that when diffing the diffs. |
|
Please someone else update or create a new PR for importing the upstream patch. I can't focus on this currently. |
|
The upstream patch wouldn't apply as-is. Maybe it will after the update. Anyway, your patch should be OK and at least it fixes the build now. Apparently, many nixpkgs users were affected. |
Description of changes
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes