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

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 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.
@cole-h
Copy link
Member

cole-h commented Jun 20, 2020

@ofborg build alacritty

Copy link
Member

cole-h left a comment

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 marsam force-pushed the marsam:fix-alacritty-darwin branch from 42ccde7 to cb11ab3 Jun 21, 2020
@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

@cole-h
cole-h approved these changes Jun 21, 2020
Copy link
Member

cole-h left a comment

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
17 checks passed
17 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
alacritty, alacritty.passthru.tests on aarch64-linux Success
Details
alacritty, alacritty.passthru.tests on x86_64-darwin Success
Details
alacritty, alacritty.passthru.tests on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="cb11ab3"; rev="cb11ab3bf6485c31a89673ba0fb26f4a5350f2cc"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="cb11ab3"; rev="cb11ab3bf6485c31a89673ba0fb26f4a5350f2cc"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="cb11ab3"; rev="cb11ab3bf6485c31a89673ba0fb26f4a5350f2cc"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="cb11ab3"; rev="cb11ab3bf6485c31a89673ba0fb26f4a5350f2cc"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="cb11ab3"; rev="cb11ab3bf6485c31a89673ba0fb26f4a5350f2cc"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="cb11ab3"; rev="cb11ab3bf6485c31a89673ba0fb26f4a5350f2cc"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="cb11ab3"; rev="cb11ab3bf6485c31a89673ba0fb26f4a5350f2cc"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@marsam marsam deleted the marsam:fix-alacritty-darwin branch Jun 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.