diff options
| author | Franz Thoma <f.m.thoma@googlemail.com> | 2017-12-13 04:55:35 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2017-12-13 04:55:35 +0100 |
| commit | 9e486344a9ceba3a64c54e3496cba57867a0a035 (patch) | |
| tree | 40aa1a33bca0cb330fc473827cd0de65bfebbde5 | |
| parent | e5629dc51a313c3b99725616718d2deff49cd891 (diff) | |
| download | nixpkgs-9e486344a9ceba3a64c54e3496cba57867a0a035.tar nixpkgs-9e486344a9ceba3a64c54e3496cba57867a0a035.tar.gz nixpkgs-9e486344a9ceba3a64c54e3496cba57867a0a035.tar.bz2 nixpkgs-9e486344a9ceba3a64c54e3496cba57867a0a035.tar.lz nixpkgs-9e486344a9ceba3a64c54e3496cba57867a0a035.tar.xz nixpkgs-9e486344a9ceba3a64c54e3496cba57867a0a035.tar.zst nixpkgs-9e486344a9ceba3a64c54e3496cba57867a0a035.zip | |
nixos.gnome3.at-spi2-core: Set environment variable `NO_AT_BRIDGE=1` if disabled
As suggested in #16327 (https://github.com/NixOS/nixpkgs/issues/16327#issuecomment-315729994).
| -rw-r--r-- | nixos/modules/services/desktops/gnome3/at-spi2-core.nix | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix index 55ed2d9ee21..9e382241348 100644 --- a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix +++ b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix @@ -28,14 +28,15 @@ with lib; ###### implementation - config = mkIf config.services.gnome3.at-spi2-core.enable { - - environment.systemPackages = [ pkgs.at_spi2_core ]; - - services.dbus.packages = [ pkgs.at_spi2_core ]; - - systemd.packages = [ pkgs.at_spi2_core ]; - - }; - + config = mkMerge [ + (mkIf config.services.gnome3.at-spi2-core.enable { + environment.systemPackages = [ pkgs.at_spi2_core ]; + services.dbus.packages = [ pkgs.at_spi2_core ]; + systemd.packages = [ pkgs.at_spi2_core ]; + }) + + (mkIf (!config.services.gnome3.at-spi2-core.enable) { + environment.variables.NO_AT_BRIDGE = "1"; + }) + ]; } |