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

gtk4: fix x64 darwin #351004

Merged
merged 1 commit into from
Oct 24, 2024
Merged

Conversation

paparodeo
Copy link
Contributor

@paparodeo paparodeo commented Oct 24, 2024

use 10.15 sdk to fix build

https://hydra.nixos.org/build/276111373

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.

use 10.15 sdk to fix build and propagate the sdk and min sdk version (10.15)
@paparodeo paparodeo force-pushed the gtk4-x86-darwin-fix branch from dc564ca to 0d75f35 Compare October 24, 2024 20:14
Comment on lines +167 to +169
] ++ lib.optionals (stdenv.hostPlatform.isDarwin
&& lib.versionOlder apple-sdk.version "10.15") [
apple-sdk_10_15
Copy link
Contributor Author

Choose a reason for hiding this comment

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

not sure if this logic is totally correct as it seems like a little hack to assume that the current sdk is apple-sdk cause it could be propagated by some other package or something.

but this still should be good enough as is limited to just x64 Darwin.

Copy link
Member

Choose a reason for hiding this comment

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

It should be fine, since newer SDKs win: the only reason to conditionalize this is because apple-sdk_10_15 can fail to evaluate (on aarch64-darwin), which is safely covered by the case lib.versionOlder apple-sdk.version "10.15".

@emilazy emilazy merged commit 17b2fbb into NixOS:staging-next Oct 24, 2024
10 of 11 checks passed
@paparodeo paparodeo deleted the gtk4-x86-darwin-fix branch October 24, 2024 20:50
@@ -165,6 +162,11 @@ stdenv.mkDerivation (finalAttrs: {
# Required for GSettings schemas at runtime.
# Will be picked up by wrapGAppsHook4.
gsettings-desktop-schemas
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
(darwinMinVersionHook "15.0")
Copy link
Contributor Author

Choose a reason for hiding this comment

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

wait a sec -- I wanted 10.15 here.

Copy link
Member

Choose a reason for hiding this comment

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

Uh, whoops. Do you mind opening a PR to fix? Otherwise I’ll get to it tomorrow.

(Finally an aggressive macOS version support policy!)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants