b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #100271 from berbiche/cagebreak-1.4.3

Browse source
This commit is contained in:
Doron Behar 2020-10-13 19:07:18 +03:00 committed by GitHub
parent 6d174dd5e0 b1296f401d
commit a17c7a9973
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
nixos/tests/cagebreak.nix
View file

@ -5,7 +5,6 @@ let
workspaces 1 workspaces 1
escape C-t escape C-t
bind t exec env DISPLAY=:0 ${pkgs.xterm}/bin/xterm -cm -pc bind t exec env DISPLAY=:0 ${pkgs.xterm}/bin/xterm -cm -pc
bind a exec ${pkgs.alacritty}/bin/alacritty
''; '';
in in
{ {
@ -20,7 +19,7 @@ in
in { in {
imports = [ ./common/user-account.nix ]; imports = [ ./common/user-account.nix ];
environment.systemPackages = [ pkgs.cagebreak ]; environment.systemPackages = [ pkgs.cagebreak pkgs.wallutils ];
services.xserver = { services.xserver = {
enable = true; enable = true;
displayManager.autoLogin = { displayManager.autoLogin = {
@ -32,7 +31,7 @@ in
manage = "desktop"; manage = "desktop";
name = "cagebreak"; name = "cagebreak";
start = '' start = ''
export XDG_RUNTIME_DIR=/run/user/${toString alice.uid} export XDG_RUNTIME_DIR="/run/user/${toString alice.uid}"
${pkgs.cagebreak}/bin/cagebreak & ${pkgs.cagebreak}/bin/cagebreak &
waitPID=$! waitPID=$!
''; '';
@ -74,24 +73,20 @@ in
testScript = { nodes, ... }: let testScript = { nodes, ... }: let
user = nodes.machine.config.users.users.alice; user = nodes.machine.config.users.users.alice;
XDG_RUNTIME_DIR = "/run/user/${toString user.uid}";
in '' in ''
start_all() start_all()
machine.wait_for_unit("multi-user.target") machine.wait_for_unit("multi-user.target")
machine.wait_for_file("/run/user/${toString user.uid}/wayland-0") machine.wait_for_file("${XDG_RUNTIME_DIR}/wayland-0")
with subtest("ensure wayland works with alacritty"): with subtest("ensure wayland works with wayinfo from wallutils"):
machine.send_key("ctrl-t") machine.succeed("env XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR} wayinfo")
machine.send_key("a")
machine.wait_until_succeeds("pgrep alacritty")
machine.wait_for_text("alice@machine")
machine.screenshot("screen")
machine.send_key("ctrl-d")
with subtest("ensure xwayland works with xterm"): with subtest("ensure xwayland works with xterm"):
machine.send_key("ctrl-t") machine.send_key("ctrl-t")
machine.send_key("t") machine.send_key("t")
machine.wait_until_succeeds("pgrep xterm") machine.wait_until_succeeds("pgrep xterm")
machine.wait_for_text("alice@machine") machine.wait_for_text("${user.name}@machine")
machine.screenshot("screen") machine.screenshot("screen")
machine.send_key("ctrl-d") machine.send_key("ctrl-d")
''; '';

4
pkgs/applications/window-managers/cagebreak/default.nix
View file

@ -8,13 +8,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cagebreak"; pname = "cagebreak";
version = "1.4.2"; version = "1.4.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "project-repo"; owner = "project-repo";
repo = "cagebreak"; repo = "cagebreak";
rev = version; rev = version;
hash = "sha256-+Ww1rsUR7qe/BixLPR8GiRc3C6QmpLzWpT2wym8b4/M="; hash = "sha256-iMoj++yjGK4hn3C675QntBYcsoBx0lEjjCM8fdvRJYo=";
}; };
nativeBuildInputs = [ meson ninja pkg-config wayland scdoc makeWrapper ]; nativeBuildInputs = [ meson ninja pkg-config wayland scdoc makeWrapper ];