diff options
| author | Uli Baum <xeji@cat3.de> | 2018-09-02 01:57:20 +0200 |
|---|---|---|
| committer | Uli Baum <xeji@cat3.de> | 2018-09-02 01:57:20 +0200 |
| commit | 7e9bd2dae1e28e8252096cc3dfdd12d353edffbd (patch) | |
| tree | 480504afe2ad1f361ffcb6c1b9b80e82ea593a86 /nixos/tests | |
| parent | 15e6e1ff6f9d8cbebdfe560b0aba57f0601aba48 (diff) | |
| download | nixlib-7e9bd2dae1e28e8252096cc3dfdd12d353edffbd.tar nixlib-7e9bd2dae1e28e8252096cc3dfdd12d353edffbd.tar.gz nixlib-7e9bd2dae1e28e8252096cc3dfdd12d353edffbd.tar.bz2 nixlib-7e9bd2dae1e28e8252096cc3dfdd12d353edffbd.tar.lz nixlib-7e9bd2dae1e28e8252096cc3dfdd12d353edffbd.tar.xz nixlib-7e9bd2dae1e28e8252096cc3dfdd12d353edffbd.tar.zst nixlib-7e9bd2dae1e28e8252096cc3dfdd12d353edffbd.zip | |
nixos/tests/flatpak: explicitly disable gdm to fix eval
The switch to lightdm as default display manager in #30890 broke eval of the flatpak test. Since the test uses the auto display manager (lightdm), gdm must now be explicitly disabled.
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/flatpak.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/tests/flatpak.nix b/nixos/tests/flatpak.nix index 096b37e6e2cb..b0c61830d05a 100644 --- a/nixos/tests/flatpak.nix +++ b/nixos/tests/flatpak.nix @@ -10,6 +10,8 @@ import ./make-test.nix ({ pkgs, ... }: machine = { pkgs, ... }: { imports = [ ./common/x11.nix ]; services.xserver.desktopManager.gnome3.enable = true; # TODO: figure out minimal environment where the tests work + # common/x11.nix enables the auto display manager (lightdm) + services.xserver.displayManager.gdm.enable = false; environment.gnome3.excludePackages = pkgs.gnome3.optionalPackages; services.flatpak.enable = true; environment.systemPackages = with pkgs; [ gnupg gnome-desktop-testing ostree python2 ]; |