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

ibus: fix dconf database #85992

Merged
merged 2 commits into from Jul 7, 2020
Merged

ibus: fix dconf database #85992

merged 2 commits into from Jul 7, 2020

Conversation

symphorien
Copy link
Member

Motivation for this change

#85892 was reverted because of an evaluation error which manifested among other in xfce test.
This is a fixed PR where the xfce test evaluates.

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): ibus and xfce
  • 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.

@symphorien
Copy link
Member Author

cc @worldofpeace @jtojnar

@symphorien symphorien requested a review from jtojnar June 1, 2020 20:02
@jtojnar
Copy link
Contributor

jtojnar commented Jun 1, 2020

Is bd6c12b#diff-a149871f918ec698c20b8b19f3f2e6d6 no longer necessary?

@jtojnar
Copy link
Contributor

jtojnar commented Jun 2, 2020

Otherwise it still look reasonable to me at a glance but did not test it.

Fixes this warning at ibus-daemon startup:

(ibus-dconf:15691): dconf-WARNING **: 21:49:24.018: unable to open file '/etc/dconf/db/ibus': Failed to open file ?/etc/dconf/db/ibus?: open() failed: No such file or directory; expect degraded performance
@symphorien
Copy link
Member Author

Oh, indeed I lost some commits with git. I will fix this.

@symphorien
Copy link
Member Author

This passes the ibus and xfce test, and I checked in a vm that ibus-daemon does not warn about dconf anymore.

Comment on lines +14 to +20
concatStringsSep "\n" (
mapAttrsToList (
name: path: ''
ln -s ${path} $out/profile/${name}
''
) cfg.profiles
)
Copy link
Member

Choose a reason for hiding this comment

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

Why won't the profiles already be linked by symlinkJoin?

Copy link
Contributor

Choose a reason for hiding this comment

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

I was also confused by this but profiles are not packages, they are just file paths.

Copy link
Member Author

Choose a reason for hiding this comment

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

yes, the symlinkJoin is only for the option packages and this loop is for the option profiles. So I think this is correct.

Copy link
Member

Choose a reason for hiding this comment

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

I understand, thanks!

Comment on lines +14 to +20
concatStringsSep "\n" (
mapAttrsToList (
name: path: ''
ln -s ${path} $out/profile/${name}
''
) cfg.profiles
)
Copy link
Member

Choose a reason for hiding this comment

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

I understand, thanks!

@worldofpeace worldofpeace merged commit 56619d6 into NixOS:master Jul 7, 2020
@worldofpeace worldofpeace mentioned this pull request Aug 11, 2020
10 tasks
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.

None yet

4 participants