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

xdg-desktop-portal-gtk: add gnome-settings-daemon #93307

Merged
merged 1 commit into from Jul 17, 2020
Merged

xdg-desktop-portal-gtk: add gnome-settings-daemon #93307

merged 1 commit into from Jul 17, 2020

Conversation

colemickens
Copy link
Member

Motivation for this change

This fixes "xdg-desktop-portal-gtk breaks font hinting".
Aka, #93199.

I've manually verified this locally. I re-enabled the xdg options that I had disabled because of #93199, and then cherry-picked this, rebuilt, logged out, checked wofi/termite and things look as expected.

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.

@colemickens
Copy link
Member Author 

> nixpkgs-review rev a2260af5197288277e8a5ab2ac8e3f10a4d7bdcc
$ git -c fetch.prune=false fetch --force https://github.com/NixOS/nixpkgs master:refs/nixpkgs-review/0
remote: Enumerating objects: 16, done.
remote: Counting objects: 100% (16/16), done.
remote: Compressing objects: 100% (6/6), done.
remote: Total 18 (delta 10), reused 15 (delta 10), pack-reused 2
Unpacking objects: 100% (18/18), 5.41 KiB | 616.00 KiB/s, done.
From https://github.com/NixOS/nixpkgs
   b2bc0d33530..951e2175c30  master     -> refs/nixpkgs-review/0
$ git worktree add /home/cole/.cache/nixpkgs-review/rev-a2260af5197288277e8a5ab2ac8e3f10a4d7bdcc/nixpkgs 951e2175c3070e98b154b211de53ca4c570295b3
Preparing worktree (detached HEAD 951e2175c30)
Updating files: 100% (22137/22137), done.
HEAD is now at 951e2175c30 GZDoom 4.3.3 -> 4.4.2
$ nix-env -f /home/cole/.cache/nixpkgs-review/rev-a2260af5197288277e8a5ab2ac8e3f10a4d7bdcc/nixpkgs -qaP --xml --out-path --show-trace
$ git merge --no-commit a2260af5197288277e8a5ab2ac8e3f10a4d7bdcc
Automatic merge went well; stopped before committing as requested
$ nix-env -f /home/cole/.cache/nixpkgs-review/rev-a2260af5197288277e8a5ab2ac8e3f10a4d7bdcc/nixpkgs -qaP --xml --out-path --show-trace --meta
1 package updated:
xdg-desktop-portal-gtk

$ nix build --no-link --keep-going --option build-use-sandbox relaxed -f /home/cole/.cache/nixpkgs-review/rev-a2260af5197288277e8a5ab2ac8e3f10a4d7bdcc/build.nix
[1 built, 0.0 MiB DL]
1 package built:
xdg-desktop-portal-gtk

$ nix-shell /home/cole/.cache/nixpkgs-review/rev-a2260af5197288277e8a5ab2ac8e3f10a4d7bdcc/shell.nix

@colemickens
Copy link
Member Author

cc: @calbrecht @jtojnar

@worldofpeace
Copy link
Contributor

Yep, we need them https://github.com/flatpak/xdg-desktop-portal-gtk/blob/fd132dc64aaaff4bb8ae5514f1370c54dc1f274e/src/settings.c#L234

worldofpeace
worldofpeace approved these changes Jul 16, 2020
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

I'd like to backport this as well

@colemickens
xdg-desktop-portal-gtk: add gnome-settings-daemon
749418c 
This fixes "xdg-desktop-portal-gtk breaks font hinting".
Aka, NixOS#93199.
@ofborg ofborg bot requested a review from jtojnar July 16, 2020 22:50
@worldofpeace worldofpeace merged commit 78fd11e into NixOS:master Jul 17, 2020
@colemickens colemickens mentioned this pull request Oct 3, 2020
Closed
@colemickens colemickens deleted the xdpg-fonts branch December 30, 2022 01:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@worldofpeace worldofpeace worldofpeace approved these changes

@jtojnar jtojnar Awaiting requested review from jtojnar

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@colemickens @worldofpeace @jtojnar