summary refs log tree commit diff
path: root/nixos/tests/installed-tests
diff options
context:
space:
mode:
authorSymphorien Gibol <symphorien+git@xlumurb.eu>2020-06-02 22:34:59 +0200
committerSymphorien Gibol <symphorien+git@xlumurb.eu>2020-06-02 22:34:59 +0200
commit11d6318a0136536734f48e49b4f4f6b5e08f9b57 (patch)
tree952611ad4769ab5f6a02b4adcc1353d1c4df2bbe /nixos/tests/installed-tests
parent3dbd629fa4fa6bb36eb96c8b7f2d675c30981ac1 (diff)
downloadnixpkgs-11d6318a0136536734f48e49b4f4f6b5e08f9b57.tar
nixpkgs-11d6318a0136536734f48e49b4f4f6b5e08f9b57.tar.gz
nixpkgs-11d6318a0136536734f48e49b4f4f6b5e08f9b57.tar.bz2
nixpkgs-11d6318a0136536734f48e49b4f4f6b5e08f9b57.tar.lz
nixpkgs-11d6318a0136536734f48e49b4f4f6b5e08f9b57.tar.xz
nixpkgs-11d6318a0136536734f48e49b4f4f6b5e08f9b57.tar.zst
nixpkgs-11d6318a0136536734f48e49b4f4f6b5e08f9b57.zip
Revert "Revert "ibus: fix dconf db installation""
This reverts commit ee5cba24c31896b6aeb0af4e21b93b878e54f747.
Diffstat (limited to 'nixos/tests/installed-tests')
-rw-r--r--nixos/tests/installed-tests/ibus.nix14
1 files changed, 5 insertions, 9 deletions
diff --git a/nixos/tests/installed-tests/ibus.nix b/nixos/tests/installed-tests/ibus.nix
index af54b612b50..a4bc2a7d7de 100644
--- a/nixos/tests/installed-tests/ibus.nix
+++ b/nixos/tests/installed-tests/ibus.nix
@@ -5,16 +5,12 @@ makeInstalledTest {
 
   testConfig = {
     i18n.inputMethod.enabled = "ibus";
+    systemd.user.services.ibus-daemon = {
+      serviceConfig.ExecStart = "${pkgs.ibus}/bin/ibus-daemon --xim --verbose";
+      wantedBy = [ "graphical-session.target" ];
+      partOf = [ "graphical-session.target" ];
+    };
   };
 
-  preTestScript = ''
-    # ibus has ibus-desktop-testing-runner but it tries to manage desktop session so we just spawn ibus-daemon ourselves
-    machine.succeed("ibus-daemon --daemonize --verbose")
-  '';
-
   withX11 = true;
-
-  # TODO: ibus-daemon is currently crashing or something
-  # maybe make ibus systemd service that auto-restarts?
-  meta.broken = true;
 }