From 7e9bd2dae1e28e8252096cc3dfdd12d353edffbd Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sun, 2 Sep 2018 01:57:20 +0200
Subject: [PATCH] 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.
---
 nixos/tests/flatpak.nix | 2 ++
 1 file changed, 2 insertions(+)

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 ];