summary refs log tree commit diff
path: root/nixos/tests
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2020-07-07 11:29:53 -0400
committerGitHub <noreply@github.com>2020-07-07 11:29:53 -0400
commit56619d6ebb7bef4f379fd909d6909d93b3121131 (patch)
tree163fd750ec3d0d582541a3981a3327dd26d0fa6b /nixos/tests
parent812468890686b8fda791d421a912dac8ca06ca4d (diff)
parent11d6318a0136536734f48e49b4f4f6b5e08f9b57 (diff)
downloadnixpkgs-56619d6ebb7bef4f379fd909d6909d93b3121131.tar
nixpkgs-56619d6ebb7bef4f379fd909d6909d93b3121131.tar.gz
nixpkgs-56619d6ebb7bef4f379fd909d6909d93b3121131.tar.bz2
nixpkgs-56619d6ebb7bef4f379fd909d6909d93b3121131.tar.lz
nixpkgs-56619d6ebb7bef4f379fd909d6909d93b3121131.tar.xz
nixpkgs-56619d6ebb7bef4f379fd909d6909d93b3121131.tar.zst
nixpkgs-56619d6ebb7bef4f379fd909d6909d93b3121131.zip
Merge pull request #85992 from symphorien/ibus-db
ibus: fix dconf database
Diffstat (limited to 'nixos/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;
 }