summary refs log tree commit diff
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2020-07-24 21:02:02 +0200
committerJan Tojnar <jtojnar@gmail.com>2020-07-24 21:02:02 +0200
commit379038b4dc818c89c931a4ce6cfc14c56fc811ec (patch)
treee0ffb4549ba8a27fceb905f2296115361e6d430a
parent98710d255298ebc6a347edcf5aa9c4a39000f671 (diff)
downloadnixpkgs-379038b4dc818c89c931a4ce6cfc14c56fc811ec.tar
nixpkgs-379038b4dc818c89c931a4ce6cfc14c56fc811ec.tar.gz
nixpkgs-379038b4dc818c89c931a4ce6cfc14c56fc811ec.tar.bz2
nixpkgs-379038b4dc818c89c931a4ce6cfc14c56fc811ec.tar.lz
nixpkgs-379038b4dc818c89c931a4ce6cfc14c56fc811ec.tar.xz
nixpkgs-379038b4dc818c89c931a4ce6cfc14c56fc811ec.tar.zst
nixpkgs-379038b4dc818c89c931a4ce6cfc14c56fc811ec.zip
nixosTests.flatpak: clean up
GNOME is not necessary. Portals probably are not either,
but the NixOS module requires them.

Not sure why it did not work without GNOME before.
-rw-r--r--nixos/tests/installed-tests/flatpak.nix5
1 files changed, 1 insertions, 4 deletions
diff --git a/nixos/tests/installed-tests/flatpak.nix b/nixos/tests/installed-tests/flatpak.nix
index 6b83d006f16..8aeeaca90f6 100644
--- a/nixos/tests/installed-tests/flatpak.nix
+++ b/nixos/tests/installed-tests/flatpak.nix
@@ -5,10 +5,7 @@ makeInstalledTest {
   withX11 = true;
 
   testConfig = {
-    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;
-    services.gnome3.core-utilities.enable = false;
+    xdg.portal.enable = true;
     services.flatpak.enable = true;
     environment.systemPackages = with pkgs; [ gnupg ostree python3 ];
     virtualisation.memorySize = 2047;