Skip to content

waydroid-helper: fix dependencies and WrapperArgs issues#412027

Merged
Aleksanaa merged 5 commits intoNixOS:masterfrom
THShafi170:update-waydroid-helper
Jun 21, 2025
Merged

waydroid-helper: fix dependencies and WrapperArgs issues#412027
Aleksanaa merged 5 commits intoNixOS:masterfrom
THShafi170:update-waydroid-helper

Conversation

@THShafi170
Copy link
Contributor

@THShafi170 THShafi170 commented May 29, 2025 •
edited
Loading

Changes done as of 21-Jun-25 02:46 PM (GMT +6):

  • Added fakeroot as dependency.
  • Added bash to buildInputs.
  • Updated makeWrapperArgs to fix issues with waydroid-cli portion of the program.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • Nixpkgs 25.11 Release Notes (or backporting 24.11 and 25.05 Nixpkgs Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
  • NixOS 25.11 Release Notes (or backporting 24.11 and 25.05 NixOS Release notes)
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@THShafi170 THShafi170 changed the title Add 'fakeroot' as dependency waydroid-helper: Add 'fakeroot' as dependency May 29, 2025
@THShafi170 THShafi170 marked this pull request as draft May 29, 2025 09:37
@NixOSInfra NixOSInfra added the 12.first-time contribution This PR is the author's first one; please be gentle! label May 29, 2025
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels May 29, 2025
@THShafi170 THShafi170 marked this pull request as ready for review May 29, 2025 09:41
@ccalhoun1999
Copy link

ccalhoun1999 commented May 31, 2025

unixutils.xxd should also be added as a dependency. I'm not sure what others are needed as tinybox seems to cover a lot of the dependency issues.

@THShafi170
Copy link
Contributor Author

THShafi170 commented May 31, 2025

unixutils.xxd should also be added as a dependency. I'm not sure what others are needed as tinybox seems to cover a lot of the dependency issues.

Having vim or vim-full installed in the system should solve the xxd error, but I'll try to look into it to whether it needs to be added or not.

Aleksanaa
Aleksanaa reviewed Jun 13, 2025
View reviewed changes
THShafi170
THShafi170 commented Jun 13, 2025
View reviewed changes
Copy link
Contributor Author

@THShafi170 THShafi170 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added bash to the buildInputs

I don't know how reviewing works, halp

@wolfgangwalther
Copy link
Contributor

wolfgangwalther commented Jun 13, 2025

Re-running CI due to a odd failure fixed in #416448

@THShafi170
Copy link
Contributor Author

THShafi170 commented Jun 21, 2025

bear with me for this one, I'm still learning how to use GitHub properly 🙏

@THShafi170
Copy link
Contributor Author

THShafi170 commented Jun 21, 2025

Lemme convert this to draft rq to avoid any confusion

@THShafi170 THShafi170 marked this pull request as draft June 21, 2025 06:20
Shafa'el Zmeyev and others added 3 commits June 21, 2025 13:27
@THShafi170 THShafi170 force-pushed the update-waydroid-helper branch from 61ab815 to 2a44813 Compare June 21, 2025 07:28
@THShafi170 THShafi170 marked this pull request as ready for review June 21, 2025 07:30
@THShafi170 THShafi170 requested review from a user and Aleksanaa June 21, 2025 07:30
@THShafi170
Copy link
Contributor Author

THShafi170 commented Jun 21, 2025

Alrighty, rebased the commit. It should be fine now.

@THShafi170 THShafi170 changed the title waydroid-helper: Add 'fakeroot' as dependency waydroid-helper: fix dependencies and WrapperArgs issues Jun 21, 2025
@THShafi170 @Aleksanaa
remove fakeroot from nativeBuildInputs
3950f3b 
Co-authored-by: Aleksana <alexander.huang.y@gmail.com>
Aleksanaa
Aleksanaa reviewed Jun 21, 2025
View reviewed changes
@Aleksanaa Aleksanaa merged commit b6cd58e into NixOS:master Jun 21, 2025
26 of 28 checks passed
@Aleksanaa
Copy link
Member

Aleksanaa commented Jun 21, 2025

Squash merged.

nixpkgs-ci bot pushed a commit that referenced this pull request Jun 21, 2025
@THShafi170 @Aleksanaa @github-actions
waydroid-helper: fix dependencies and WrapperArgs issues (#412027)
7e8fd3d 
Co-authored-by: Aleksana <alexander.huang.y@gmail.com>
Co-authored-by: Shafa'el Zmeyev <shafael170@gmail.com>
(cherry picked from commit b6cd58e)
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Jun 21, 2025

Successfully created backport PR for release-25.05:

@nixpkgs-ci nixpkgs-ci bot mentioned this pull request Jun 21, 2025
Merged
1 task
@github-actions github-actions bot added the 8.has: port to stable This PR already has a backport to the stable release. label Jun 21, 2025
@THShafi170 THShafi170 deleted the update-waydroid-helper branch June 21, 2025 15:58
@THShafi170 THShafi170 restored the update-waydroid-helper branch June 21, 2025 16:02
@THShafi170 THShafi170 deleted the update-waydroid-helper branch June 21, 2025 16:03
@THShafi170 THShafi170 restored the update-waydroid-helper branch June 21, 2025 16:03
@ghost ghost removed their request for review June 21, 2025 16:18
@THShafi170 THShafi170 deleted the update-waydroid-helper branch July 4, 2025 17:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Aleksanaa Aleksanaa Aleksanaa left review comments

Assignees

No one assigned

Labels

8.has: port to stable This PR already has a backport to the stable release. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 12.first-time contribution This PR is the author's first one; please be gentle!

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@THShafi170 @ccalhoun1999 @wolfgangwalther @Aleksanaa @NixOSInfra