Skip to content

Comments

gtk3: fix darwin build#153412

Merged
jtojnar merged 1 commit intoNixOS:stagingfrom
mikroskeem:darwin-fix-gtk3
Jan 4, 2022
Merged

gtk3: fix darwin build#153412
jtojnar merged 1 commit intoNixOS:stagingfrom
mikroskeem:darwin-fix-gtk3

Conversation

@mikroskeem
Copy link
Member

@mikroskeem mikroskeem commented Jan 3, 2022

3.24.31 does not declare QuartzCore dependency properly and fails to link. Apply changes from https://gitlab.gnome.org/GNOME/gtk/-/commit/0ac61443694b477c41fc246cb387ef86aba441de to add missing QuartzCore dependency.

Motivation for this change

See #152948

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.05 Release Notes (or backporting 21.11 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@mikroskeem mikroskeem requested review from jtojnar and removed request for jtojnar January 3, 2022 23:33
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Jan 3, 2022
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jan 3, 2022
@jtojnar
Copy link
Member

jtojnar commented Jan 4, 2022

@jtojnar
Copy link
Member

jtojnar commented Jan 4, 2022

Actually, we should just fetch https://gitlab.gnome.org/GNOME/gtk/-/commit/0ac61443694b477c41fc246cb387ef86aba441de.

@mikroskeem
Copy link
Member Author

Will update PR later today (GMT+2).

3.24.31 does not declare QuartzCore dependency properly and fails to link
@ofborg ofborg bot added 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. and removed 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jan 4, 2022
@jtojnar jtojnar merged commit d551b7a into NixOS:staging Jan 4, 2022
@jtojnar
Copy link
Member

jtojnar commented Jan 4, 2022

Thanks.

@veprbl
Copy link
Member

veprbl commented Jan 18, 2022

This is broken on staging-next:
https://hydra.nixos.org/build/164647419

trying https://gitlab.gnome.org/GNOME/gtk/-/commit/0ac61443694b477c41fc246cb387ef86aba441de.patch
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100  1723  100  1723    0     0   3218      0 --:--:-- --:--:-- --:--:--  3214
hash mismatch in fixed-output derivation '/nix/store/lz1d8bymwdfi2n3r6577p8ggbhxripcz-0ac61443694b477c41fc246cb387ef86aba441de.patch':
  wanted: sha256:1ya1likckhng96ragamvslvgnc1z235k5c6j9fcmw8iiw0szy93a
  got:    sha256:0v07lx5hqf9r26awwk0z61pkplgp324r8z9kqwwg70bzslhix8r9

cc #154708

@mikroskeem
Copy link
Member Author

How did this hash change even...

@veprbl
Copy link
Member

veprbl commented Jan 18, 2022

Did you check that it was the same after you've updated the URL?

@mikroskeem
Copy link
Member Author

nix-prefetch-url "https://gitlab.gnome.org/GNOME/gtk/-/commit/0ac61443694b477c41fc246cb387ef86aba441de.patch"
path is '/nix/store/hjhmqapyyp4lyrcssdvxkhbg38053spw-0ac61443694b477c41fc246cb387ef86aba441de.patch'
1ya1likckhng96ragamvslvgnc1z235k5c6j9fcmw8iiw0szy93a

I'm confused

@veprbl
Copy link
Member

veprbl commented Jan 18, 2022

fetchpatch does some preprocessing on the patch, so it's not the same as a plain fetchurl

@vcunat
Copy link
Member

vcunat commented Jan 18, 2022

That's a common mistake. The point of fetchpatch is that dynamically generated patches do not have a stable hash unless normalized.

@mikroskeem
Copy link
Member Author

Makes sense. Will grab updated hash and open a new PR targeting staging-next (?)

@vcunat
Copy link
Member

vcunat commented Jan 18, 2022

I can do that directly without the PR complexity.

@mikroskeem
Copy link
Member Author

Thank you :)

vcunat added a commit that referenced this pull request Jan 18, 2022
The usual nix-prefetch-url confusion with fetchpatch:
#153412 (comment)
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: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 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