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

espanso: fix build on Darwin #347008

Merged
merged 1 commit into from
Oct 11, 2024
Merged

Conversation

reckenrode
Copy link
Contributor

Use the 11.0 SDK with a 10.13 deployment target.

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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Oct 7, 2024
@ofborg ofborg bot requested review from pyrox0 and n8henrie October 7, 2024 05:55
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Oct 7, 2024
@reckenrode reckenrode force-pushed the reckenrode/darwin-sdk-refactor branch from 183877a to 1fd30e4 Compare October 8, 2024 02:51
@reckenrode reckenrode force-pushed the push-tsyorulslxkw branch 2 times, most recently from 2c7ac66 to adcbc2c Compare October 8, 2024 03:29
@reckenrode reckenrode deleted the branch NixOS:staging October 8, 2024 03:30
@reckenrode reckenrode closed this Oct 8, 2024
@reckenrode reckenrode reopened this Oct 8, 2024
@n8henrie
Copy link
Contributor

n8henrie commented Oct 8, 2024

@reckenrode I assume I should be able to build like so (and the error is why you've changed to draft)?

$ nix build github:reckenrode/nixpkgs/push-tsyorulslxkw#espanso
error:
       … while calling the 'abort' builtin

         at /nix/store/y4xd7x400xq6d96shzarid481l6fcxip-source/lib/customisation.nix:269:13:

          268|        # which is especially relevant with allowAliases = false
          269|        else abort "lib.customisation.callPackageWith: ${error}";
             |             ^
          270|

       error: evaluation aborted with the following error message: 'lib.customisation.callPackageWith: Function called without required argument "apple-sdk_11" at /nix/store/y4xd7x400xq6d96shzarid481l6fcxip-source/pkgs/
applications/office/espanso/default.nix:21'

@reckenrode
Copy link
Contributor Author

@reckenrode I assume I should be able to build like so (and the error is why you've changed to draft)?

It’s a draft because it depends on #346043. Once that PR is merged, GitHub should (in theory) switch the branch to staging, then I can set it to ready. That’s about as close as GitHub gets to supporting stacked PRs.

@reckenrode reckenrode force-pushed the reckenrode/darwin-sdk-refactor branch 2 times, most recently from a240201 to 4112f1a Compare October 9, 2024 02:16
Use the 11.0 SDK with a 10.13 deployment target.
@reckenrode reckenrode force-pushed the reckenrode/darwin-sdk-refactor branch 2 times, most recently from a1adff0 to e3f2829 Compare October 10, 2024 20:25
@emilazy emilazy marked this pull request as ready for review October 10, 2024 22:53
@emilazy emilazy deleted the branch NixOS:staging October 11, 2024 00:01
@emilazy emilazy closed this Oct 11, 2024
@emilazy emilazy reopened this Oct 11, 2024
@emilazy emilazy changed the base branch from reckenrode/darwin-sdk-refactor to staging October 11, 2024 00:07
@emilazy emilazy merged commit f589bba into NixOS:staging Oct 11, 2024
42 of 44 checks passed
@reckenrode reckenrode deleted the push-tsyorulslxkw branch October 11, 2024 13:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants