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

gnome3.gnome-characters: correct entry point #67110

Merged
merged 2 commits into from Aug 20, 2019

Conversation

worldofpeace
Copy link
Contributor

Motivation for this change

Fix #31168

@jtojnar Do you remember if this was an edge case or a general issue?
If in general, maybe we could have a setup-hook to do this.

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 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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

By wraping the files, the `*-.wrapped` file will be recognized as the
entry point, which is used as a base for loading additional files so
we need to override the entry point function.

We also ensure BackgroundService gets wrapped with wrapGAppsHook.

Fixes NixOS#31168

Co-authored-by: Jan Tojnar <jtojnar@gmail.com>
Copy link
Contributor

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

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

Looks good, if I recall correctly.

pkgs/desktops/gnome-3/apps/gnome-characters/default.nix Outdated Show resolved Hide resolved
pkgs/desktops/gnome-3/apps/gnome-characters/default.nix Outdated Show resolved Hide resolved
@jtojnar
Copy link
Contributor

jtojnar commented Aug 20, 2019

This is a general issue with wrapping scripts that use argv[0], as linux does not allow to overwrite it when execing scripts, see #31168 (comment).

@ofborg ofborg bot added the 6.topic: GNOME GNOME desktop environment and its underlying platform label Aug 20, 2019
@ofborg ofborg bot requested a review from jtojnar August 20, 2019 19:21
Copy link
Contributor

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

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

Looks great. Thanks for tackling this.

];

mesonFlags = [
"-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/services"
Copy link
Contributor

Choose a reason for hiding this comment

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

Cool. Did not notice this is no longer necessary.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah I forgot to mention that.

@ofborg ofborg bot requested a review from jtojnar August 20, 2019 20:30
@jtojnar jtojnar merged commit 129cb7e into NixOS:master Aug 20, 2019
@worldofpeace
Copy link
Contributor Author

Thanks @jtojnar

@worldofpeace worldofpeace deleted the gnome-characters-fix branch August 20, 2019 20:40
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/does-anyone-here-uses-sushi-with-nautilus-not-on-gnome/4539/3

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

Successfully merging this pull request may close these issues.

GNOME characters not launcable via GNOME shell
3 participants