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.at-spi2-core: Set environment variable NO_AT_BRIDGE=1 if disabled #32592

Merged
merged 1 commit into from Dec 13, 2017

Conversation

fmthoma
Copy link
Contributor

@fmthoma fmthoma commented Dec 12, 2017

As suggested by @jtojnar and @abbradar in #16327.

Motivation for this change

See #16327 (comment)

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

mkIf !config.services.gnome3.at-spi2-core.enable {
environment.variables.NO_AT_BRIDGE = "1";
}
]
Copy link
Contributor

Choose a reason for hiding this comment

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

Missing semicolon?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Whoops... The downside of using Github as an editor. Fixed it.

environment.systemPackages = [ pkgs.at_spi2_core ];
services.dbus.packages = [ pkgs.at_spi2_core ];
systemd.packages = [ pkgs.at_spi2_core ];
};
Copy link
Contributor

Choose a reason for hiding this comment

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

Only after the config attribute, lists items are not supposed to end with semicolons.

@jtojnar jtojnar added the 6.topic: GNOME GNOME desktop environment and its underlying platform label Dec 12, 2017
@jtojnar
Copy link
Contributor

jtojnar commented Dec 12, 2017

Hmm, the evaluation still fails
https://gist.github.com/3cb5e6fcc5b61fc40ed9def7e104efb1

@fmthoma
Copy link
Contributor Author

fmthoma commented Dec 12, 2017

Yeah, the parentheses around the negation were missing...

@fmthoma
Copy link
Contributor Author

fmthoma commented Dec 12, 2017

Also added the missing parentheses around the two mkIf … {…} expressions. Now all checks are passing.

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.

I checked both options with xfce and it works correctly. Thanks.

@jtojnar jtojnar merged commit 9e48634 into NixOS:master Dec 13, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: GNOME GNOME desktop environment and its underlying platform 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants