Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rustdesk-flutter: fix build #356450

Merged
merged 1 commit into from
Nov 17, 2024
Merged

rustdesk-flutter: fix build #356450

merged 1 commit into from
Nov 17, 2024

Conversation

Bot-wxt1221
Copy link
Member

@Bot-wxt1221 Bot-wxt1221 commented Nov 16, 2024

ZHF: #352882

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (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.

@Bot-wxt1221 Bot-wxt1221 added 0.kind: ZHF Fixes Fixes during the Zero Hydra Failures (ZHF) campaign backport release-24.11 Backport PR automatically labels Nov 16, 2024
@Bot-wxt1221
Copy link
Member Author

@ofborg build rustdesk-flutter

@Bot-wxt1221

This comment was marked as resolved.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Nov 17, 2024
@Bot-wxt1221
Copy link
Member Author

Bot-wxt1221 commented Nov 17, 2024

@dasJ

buildAppWith = flutter: buildDartApplication.override { dart = flutter; };
in
buildAppWith minimalFlutter (builderArgs // { passthru = builderArgs.passthru or { } // { multiShell = buildAppWith flutter builderArgs; }; })

generators = callPackage ./generators.nix { inherit dart; } { buildDrvArgs = args; };

buildDrvInheritArgs = builtins.foldl'
(attrs: arg:
if buildDrvArgs ? ${arg}
then attrs // { ${arg} = buildDrvArgs.${arg}; }
else attrs)

BuildFlutterApplication actually is a wrapper of buildDartApplication.

Args from buildFlutterApplication will be passed to buildDartApplication and the package-config-with-root.json. However, It doesn't have cargoDepsCopy. Before that, substituteInPlace won't report error if file doesn't exist but now It will.

So that's caused by #350216.

UPD: indent was OK now.

@Bot-wxt1221 Bot-wxt1221 added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 17, 2024
@dasJ dasJ merged commit 02d0071 into NixOS:master Nov 17, 2024
11 of 12 checks passed
Copy link
Contributor

Successfully created backport PR for release-24.11:

github-actions bot pushed a commit that referenced this pull request Nov 17, 2024
dasJ pushed a commit that referenced this pull request Nov 17, 2024
rustdesk-flutter: fix build (#356450)

(cherry picked from commit 02d0071)

Co-authored-by: Bot_wxt1221 <[email protected]>
Daru-san pushed a commit to Daru-san/nixpkgs that referenced this pull request Nov 20, 2024
paschoal pushed a commit to paschoal/nixpkgs that referenced this pull request Nov 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0.kind: ZHF Fixes Fixes during the Zero Hydra Failures (ZHF) campaign 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 12.approvals: 1 This PR was reviewed and approved by one reputable person backport release-24.11 Backport PR automatically
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants