diff options
author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-06-21 18:24:35 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-21 18:24:35 -0400 |
commit | fe948fd6b01a67a8977271fa4129437296f14a8c (patch) | |
tree | 6ea806c1bf8b5979c64bebdeed8c7f5ac0979495 /nixos | |
parent | e050011aa37fa7108fc26389b557adaf3f682319 (diff) | |
parent | 51bafa64716476d2296b3bca30ccef1f5599ab39 (diff) | |
download | nixpkgs-fe948fd6b01a67a8977271fa4129437296f14a8c.tar nixpkgs-fe948fd6b01a67a8977271fa4129437296f14a8c.tar.gz nixpkgs-fe948fd6b01a67a8977271fa4129437296f14a8c.tar.bz2 nixpkgs-fe948fd6b01a67a8977271fa4129437296f14a8c.tar.lz nixpkgs-fe948fd6b01a67a8977271fa4129437296f14a8c.tar.xz nixpkgs-fe948fd6b01a67a8977271fa4129437296f14a8c.tar.zst nixpkgs-fe948fd6b01a67a8977271fa4129437296f14a8c.zip |
Merge pull request #42327 from bkchr/fix_plasma5_test
tests.plasma5: Fixes OCR in sddm by providing a custom theme
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/tests/plasma5.nix | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix index f3bd4c5915b..14ab2e30cab 100644 --- a/nixos/tests/plasma5.nix +++ b/nixos/tests/plasma5.nix @@ -6,13 +6,28 @@ import ./make-test.nix ({ pkgs, ...} : maintainers = [ ttuegel ]; }; - machine = { lib, ... }: { + machine = { lib, ... }: + let + sddm_theme = pkgs.stdenv.mkDerivation { + name = "breeze-ocr-theme"; + phases = "buildPhase"; + buildCommand = '' + mkdir -p $out/share/sddm/themes/ + cp -r ${pkgs.plasma-workspace}/share/sddm/themes/breeze $out/share/sddm/themes/breeze-ocr-theme + chmod -R +w $out/share/sddm/themes/breeze-ocr-theme + printf "[General]\ntype=color\ncolor=#1d99f3\nbackground=\n" > $out/share/sddm/themes/breeze-ocr-theme/theme.conf + ''; + }; + in + { imports = [ ./common/user-account.nix ]; services.xserver.enable = true; services.xserver.displayManager.sddm.enable = true; + services.xserver.displayManager.sddm.theme = "breeze-ocr-theme"; services.xserver.desktopManager.plasma5.enable = true; services.xserver.desktopManager.default = "plasma5"; virtualisation.memorySize = 1024; + environment.systemPackages = [ sddm_theme ]; # fontconfig-penultimate-0.3.3 -> 0.3.4 broke OCR apparently, but no idea why. nixpkgs.config.packageOverrides = superPkgs: { @@ -30,7 +45,6 @@ import ./make-test.nix ({ pkgs, ...} : xdo = "${pkgs.xdotool}/bin/xdotool"; in '' startAll; - # Wait for display manager to start $machine->waitForText(qr/${user.description}/); $machine->screenshot("sddm"); |