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

Jump to bottom

glibmm: fix darwin build #54428

Merged
merged 1 commit into from Jan 21, 2019
Merged

glibmm: fix darwin build #54428

merged 1 commit into from Jan 21, 2019

Conversation

jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Jan 21, 2019

Motivation for this change

See #54007 (comment)

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@jtojnar jtojnar requested a review from hedning January 21, 2019 16:30
@GrahamcOfBorg GrahamcOfBorg added the 6.topic: darwin Running or building packages on Darwin label Jan 21, 2019
@hedning
Copy link
Contributor

hedning commented Jan 21, 2019

There's a few more failures (the full list of):

  • gtk2-x11 and it's gtk3 variant, not sure if these make sense on darwin?
  • libfm

@jtojnar jtojnar mentioned this pull request Jan 21, 2019
Open
@hedning hedning merged commit b262be3 into NixOS:staging Jan 21, 2019
@hedning
Copy link
Contributor

hedning commented Jan 21, 2019

Thanks :)

@hedning
Copy link
Contributor

hedning commented Jan 21, 2019

Hmm, should probably go to master though (didn't look closely at the base).

@jtojnar
Copy link
Contributor Author

jtojnar commented Jan 21, 2019

I pushed it to staging since the glib patch is there as well.

Here is an issue for libfm lxde/libfm#44

@jtojnar jtojnar deleted the glibmm-darwin branch January 21, 2019 17:41
@hedning
Copy link
Contributor

hedning commented Jan 21, 2019

Ah, #54007 went to master though :)

@jtojnar
Copy link
Contributor Author

jtojnar commented Jan 21, 2019

🤷‍♀️

@hedning
Copy link
Contributor

hedning commented Jan 21, 2019

I'll cherry pick and fix, it's blocking nixpkgs-unstable.

@jtojnar
Copy link
Contributor Author

jtojnar commented Jan 21, 2019

I do not see logs for gtk3-x11 or gtk2-x11. Maybe we should just use Cocoa GTK on Darwin.

@hedning
Copy link
Contributor

hedning commented Jan 21, 2019

Yeah, the logs broke for some reason :(

Maybe we should just use Cocoa GTK on Darwin.

Yeah, there aren't that many packages that use the x11 variant.

@jtojnar
Copy link
Contributor Author

jtojnar commented Jan 21, 2019

cc @johbo 8a7d373

cc @LnL7 cfc3d7c

@hedning
Copy link
Contributor

hedning commented Jan 21, 2019

cherry pick: c9bd2de

@hedning hedning mentioned this pull request Jan 21, 2019
Closed
jtojnar referenced this pull request Apr 21, 2019
@hedning @jtojnar
librsvg: 2.44.12 -> 2.45.5
43f21c5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hedning hedning hedning approved these changes

@7c6f434c 7c6f434c Awaiting requested review from 7c6f434c

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 11-100 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@jtojnar @hedning @GrahamcOfBorg