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

riot-desktop: wrap with wrapGAppsHook #84285

Merged
merged 2 commits into from Apr 6, 2020
Merged

riot-desktop: wrap with wrapGAppsHook #84285

merged 2 commits into from Apr 6, 2020

Conversation

worldofpeace
Copy link
Contributor

@worldofpeace worldofpeace commented Apr 4, 2020 •
edited

Motivation for this change

By not using wrapGAppsHook we're missing other important things in the wrapper.
Things like

export XDG_DATA_DIRS='/nix/store/h11fidilg14qg0ppx7dsg1na2bybpk8c-riot-desktop-1.5.15/share'${XDG_DATA_DIRS:+':'}$XDG_DATA_DIRS
export GIO_EXTRA_MODULES='/nix/store/z7gzw2bb3ypvf1wq1fjjn5r45idfgg0g-dconf-0.34.0-lib/lib/gio/modules'${GIO_EXTRA_MODULES:+':'}$GIO_EXTRA_MODULES
export GDK_PIXBUF_MODULE_FILE='/nix/store/18l8ly5235r94s2rr122i3cfichccxqn-librsvg-2.46.4/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache'

dconf is needed for gsettings.

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.

pacien
pacien approved these changes Apr 4, 2020
View reviewed changes
Copy link
Contributor

@pacien pacien left a comment

Choose a reason for hiding this comment

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

LGTM; successfully tested the selection of a file.

This might need to be backported to the release-20.03 branch.

rnhmjoj
rnhmjoj approved these changes Apr 6, 2020
View reviewed changes
Copy link
Contributor

@rnhmjoj rnhmjoj 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. Thank you for fixing my original PR.

@ofborg ofborg bot requested a review from pacien April 6, 2020 07:42
@worldofpeace worldofpeace merged commit 52a62d3 into NixOS:master Apr 6, 2020
@worldofpeace worldofpeace deleted the riot-gsettings branch April 6, 2020 07:51
@worldofpeace
Copy link
Contributor Author

No problem @rnhmjoj.
Backported to 20.03 in 57ecbc5 a128dd3.
We probably should do the same for 19.09. (but it's pretty out of date there).

@rnhmjoj rnhmjoj mentioned this pull request Apr 7, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rnhmjoj rnhmjoj rnhmjoj approved these changes

@pacien pacien Awaiting requested review from pacien

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@worldofpeace @pacien @rnhmjoj