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

gtk3: re-enable demos #63060

Merged
merged 1 commit into from Jun 20, 2019
Merged

gtk3: re-enable demos #63060

merged 1 commit into from Jun 20, 2019

Conversation

layus
Copy link
Member

@layus layus commented Jun 13, 2019

Motivation for this change

Demos are quite useful in debugging and developing gtk.
They also end up in gtk3.dev, and do not impact the closure size of a
running system.

Plus, it has been five years now that they are disabled ;-)

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
  • 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 nix-review --run "nix-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)
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested review from 7c6f434c and vcunat June 13, 2019 07:37
@layus layus changed the base branch from master to staging June 13, 2019 07:56
@layus
Copy link
Member Author

layus commented Jun 13, 2019

Moved to staging looking due to the huge impact.

@7c6f434c
Copy link
Member

Maybe add the date of the commit to the old comment?

@jtojnar
Copy link
Contributor

jtojnar commented Jun 13, 2019

IIRC the demos need to be wrapped to add GTK GSettings schemas to XDG_DATA_DIRS. And wrapGAppsHook will not work because it already depends on gtk3.

@worldofpeace
Copy link
Contributor

How about just make a separate package that wraps them gtk3-demos?
(can we get the demos in a separate output too?)

@jtojnar
Copy link
Contributor

jtojnar commented Jun 13, 2019

IMHO it is more predictable if there are no unwrapped packages. Users will get confused why the unwrapped package does not work.

I think the best solution for now is to add the schemas manually by wrapProgram, in the future we should decompose wrapGAppsHook.

@jtojnar
Copy link
Contributor

jtojnar commented Jun 13, 2019

Actually, why does wrapGAppsHook even depend on GTK? GTK applications will already have it in their dependencies and non-GTK do not need it.

@7c6f434c
Copy link
Member

Separate output sounds nice conceptually, even if the size of the demos is small.

@layus
Copy link
Member Author

layus commented Jun 14, 2019

Well, my take is that it is useful to have them compiled. It may no be the best way but unless someone wants to work on separate outputs and refactoring wrapGAppsHook, I suggest we merge this as-is, and see later if someone really needs this to work in the improved way. I am not going to adapt to all the suggestions here but we can close this PR and open a proper issue if it seems better suited.

@7c6f434c 7c6f434c merged commit ffd9bf7 into NixOS:staging Jun 20, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@7c6f434c 7c6f434c Awaiting requested review from 7c6f434c

@vcunat vcunat Awaiting requested review from vcunat

Assignees
No one assigned
Labels
10.rebuild-darwin: 501-1000 10.rebuild-darwin: 501+ 10.rebuild-linux: 501+ 10.rebuild-linux: 2501-5000
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@layus @7c6f434c @jtojnar @worldofpeace