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.

Sign up for GitHub

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

Merge pull request #77917 from hedning/fix-gtk-3.24.13-darwin #77917

Merged
merged 1 commit into from
Jan 17, 2020
Merged

Merge pull request #77917 from hedning/fix-gtk-3.24.13-darwin #77917

merged 1 commit into from
Jan 17, 2020
+59 −0

Conversation

hedning
Copy link
Contributor

@hedning hedning commented Jan 17, 2020 •
edited
Loading

Motivation for this change

gtk3-3.24.13 failed to ship a header file necessary for darwin in their tarball: https://gitlab.gnome.org/GNOME/gtk/issues/2279.

Add the file through a conditional patch to avoid any rebuilds on linux.

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.

Sorry, something went wrong.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Jan 17, 2020
@ofborg ofborg bot requested review from 7c6f434c, vcunat and worldofpeace January 17, 2020 13:14
@ofborg ofborg bot added 10.rebuild-darwin: 501+ 10.rebuild-darwin: 501-1000 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Jan 17, 2020
@hedning
Copy link
Contributor Author

hedning commented Jan 17, 2020

Embedded the patch because the upstream commit did a bunch more stuff which is already applied. Could of course upload it to avoid a file which will need to be removed next release.

@hedning hedning mentioned this pull request Jan 17, 2020
Merged
10 tasks
@Mic92 Mic92 changed the title gtk3: fix missing header file on darwin Merge pull request #77917 from hedning/fix-gtk-3.24.13-darwin Jan 17, 2020
@Mic92 Mic92 merged commit e5fa0ab into NixOS:staging-next Jan 17, 2020
@hedning hedning deleted the fix-gtk-3.24.13-darwin branch January 17, 2020 13:37
@dtzWill
Copy link
Member

dtzWill commented Jan 17, 2020

Great, thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@7c6f434c 7c6f434c

@vcunat vcunat

@worldofpeace worldofpeace

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 501-1000 10.rebuild-darwin: 501+ 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@hedning @dtzWill @Mic92