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

Jump to bottom

alacritty: fix build on darwin #91198

Merged
merged 1 commit into from Jun 21, 2020
Merged

alacritty: fix build on darwin #91198

merged 1 commit into from Jun 21, 2020

Conversation

marsam
Copy link
Contributor

@marsam marsam commented Jun 20, 2020

Motivation for this change

See: https://hydra.nixos.org/build/122547742

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Jun 20, 2020
@ofborg ofborg bot requested review from Br1ght0ne, cole-h, Ma27 and Mic92 June 20, 2020 23:10
@cole-h
Copy link
Member

cole-h commented Jun 20, 2020

@ofborg build alacritty

cole-h
cole-h requested changes Jun 20, 2020
View reviewed changes
Copy link
Member

@cole-h cole-h left a comment

Choose a reason for hiding this comment

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

Ah, this is my bad, oops. I forgot that Alacritty.app is generated in the postBuild using a Makefile (which isn't called with the --target flag as buildRustPackage now uses). It only worked prior to merging #82342 because releaseDir was the same as target/release...

Maybe we could sed that flag into the Makefile, so there aren't two compilations happening? Either way, thanks for catching this.

(I forgot borg does actually build on Darwin if the submitter is a trusted user, which is why I pinged it to build above... oops x2.)

@marsam
Copy link
Contributor Author

marsam commented Jun 21, 2020

no worries :)

Maybe we could sed that flag into the Makefile, so there aren't two compilations happening?

Thanks, this seems a better solution.
I manually installed Alacritty.app because modifying the Makefile would get cumbersome

@ofborg ofborg bot requested a review from cole-h June 21, 2020 01:01
cole-h
cole-h approved these changes Jun 21, 2020
View reviewed changes
Copy link
Member

@cole-h cole-h left a comment

Choose a reason for hiding this comment

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

A much more elegant solution than seding -- thanks! I had never really looked at the Makefile, so I guess it makes sense that this is relatively easy.

borg is happy, so I'm happy (assuming this works as expected on darwin).

[2 built, 76 copied (1050.6 MiB), 298.0 MiB DL]
https://github.com/NixOS/nixpkgs/pull/91198
1 package built:
alacritty

@marsam marsam merged commit 1ca783c into NixOS:master Jun 21, 2020
@marsam marsam deleted the fix-alacritty-darwin branch June 21, 2020 02:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cole-h cole-h cole-h approved these changes

@Br1ght0ne Br1ght0ne Awaiting requested review from Br1ght0ne

@Ma27 Ma27 Awaiting requested review from Ma27

@Mic92 Mic92 Awaiting requested review from Mic92

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@marsam @cole-h