From e673b84266eec9d5c273d6ef10cf1c45fe7c829c Mon Sep 17 00:00:00 2001 From: Tert0 Date: Thu, 30 Jan 2025 22:23:36 +0100 Subject: [PATCH 1/3] swaylock,swaybg: nixfmt --- pkgs/by-name/sw/swaybg/package.nix | 35 ++++++++++++++++++++----- pkgs/by-name/sw/swaylock/package.nix | 39 +++++++++++++++++++++++----- 2 files changed, 61 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/sw/swaybg/package.nix b/pkgs/by-name/sw/swaybg/package.nix index 6536847abbe4..61632dffe77b 100644 --- a/pkgs/by-name/sw/swaybg/package.nix +++ b/pkgs/by-name/sw/swaybg/package.nix @@ -1,7 +1,16 @@ -{ lib, stdenv, fetchFromGitHub -, meson, ninja, pkg-config, scdoc -, wayland, wayland-protocols, cairo, gdk-pixbuf -, wayland-scanner +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + scdoc, + wayland, + wayland-protocols, + cairo, + gdk-pixbuf, + wayland-scanner, }: stdenv.mkDerivation rec { @@ -17,11 +26,23 @@ stdenv.mkDerivation rec { strictDeps = true; depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; - buildInputs = [ wayland wayland-protocols cairo gdk-pixbuf ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + scdoc + wayland-scanner + ]; + buildInputs = [ + wayland + wayland-protocols + cairo + gdk-pixbuf + ]; mesonFlags = [ - "-Dgdk-pixbuf=enabled" "-Dman-pages=enabled" + "-Dgdk-pixbuf=enabled" + "-Dman-pages=enabled" ]; meta = with lib; { diff --git a/pkgs/by-name/sw/swaylock/package.nix b/pkgs/by-name/sw/swaylock/package.nix index f76f7cdbf0b4..dd0730b291b6 100644 --- a/pkgs/by-name/sw/swaylock/package.nix +++ b/pkgs/by-name/sw/swaylock/package.nix @@ -1,6 +1,18 @@ -{ lib, stdenv, fetchFromGitHub -, meson, ninja, pkg-config, scdoc, wayland-scanner -, wayland, wayland-protocols, libxkbcommon, cairo, gdk-pixbuf, pam +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + scdoc, + wayland-scanner, + wayland, + wayland-protocols, + libxkbcommon, + cairo, + gdk-pixbuf, + pam, }: stdenv.mkDerivation rec { @@ -16,11 +28,26 @@ stdenv.mkDerivation rec { strictDeps = true; depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; - buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + scdoc + wayland-scanner + ]; + buildInputs = [ + wayland + wayland-protocols + libxkbcommon + cairo + gdk-pixbuf + pam + ]; mesonFlags = [ - "-Dpam=enabled" "-Dgdk-pixbuf=enabled" "-Dman-pages=enabled" + "-Dpam=enabled" + "-Dgdk-pixbuf=enabled" + "-Dman-pages=enabled" ]; meta = with lib; { From 9051c1273dab6893e0a84eecb4b6dfeaad49487a Mon Sep 17 00:00:00 2001 From: Tert0 Date: Fri, 31 Jan 2025 12:44:11 +0100 Subject: [PATCH 2/3] swaylock,swaybg: fix svg support --- pkgs/by-name/sw/swaybg/package.nix | 7 ++++++- pkgs/by-name/sw/swaylock/package.nix | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sw/swaybg/package.nix b/pkgs/by-name/sw/swaybg/package.nix index 61632dffe77b..c65abd5bd7ca 100644 --- a/pkgs/by-name/sw/swaybg/package.nix +++ b/pkgs/by-name/sw/swaybg/package.nix @@ -11,6 +11,8 @@ cairo, gdk-pixbuf, wayland-scanner, + wrapGAppsNoGuiHook, + librsvg }: stdenv.mkDerivation rec { @@ -20,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "swaywm"; repo = "swaybg"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-IJcPSBJErf8Dy9YhYAc9eg/llgaaLZCQSB0Brof+kpg="; }; @@ -32,12 +34,15 @@ stdenv.mkDerivation rec { pkg-config scdoc wayland-scanner + wrapGAppsNoGuiHook + gdk-pixbuf ]; buildInputs = [ wayland wayland-protocols cairo gdk-pixbuf + librsvg ]; mesonFlags = [ diff --git a/pkgs/by-name/sw/swaylock/package.nix b/pkgs/by-name/sw/swaylock/package.nix index dd0730b291b6..b575c35be975 100644 --- a/pkgs/by-name/sw/swaylock/package.nix +++ b/pkgs/by-name/sw/swaylock/package.nix @@ -13,6 +13,8 @@ cairo, gdk-pixbuf, pam, + wrapGAppsNoGuiHook, + librsvg }: stdenv.mkDerivation rec { @@ -22,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "swaywm"; repo = "swaylock"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-1+AXxw1gH0SKAxUa0JIhSzMbSmsfmBPCBY5IKaYtldg="; }; @@ -34,6 +36,8 @@ stdenv.mkDerivation rec { pkg-config scdoc wayland-scanner + wrapGAppsNoGuiHook + gdk-pixbuf ]; buildInputs = [ wayland @@ -42,6 +46,7 @@ stdenv.mkDerivation rec { cairo gdk-pixbuf pam + librsvg ]; mesonFlags = [ From 71ce1c341318bd839f0f5256d7f42621ab0e6aab Mon Sep 17 00:00:00 2001 From: Tert0 Date: Fri, 31 Jan 2025 14:03:32 +0100 Subject: [PATCH 3/3] nixos/tests/{sway,swayfx}: fix pgrep commands to match wrapped swaylock --- nixos/tests/sway.nix | 6 +++--- nixos/tests/swayfx.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/tests/sway.nix b/nixos/tests/sway.nix index 13fa5dacbd92..75035c5b9f65 100644 --- a/nixos/tests/sway.nix +++ b/nixos/tests/sway.nix @@ -192,15 +192,15 @@ import ./make-test-python.nix ( machine.screenshot("sway_exit") swaymsg("exec swaylock") - machine.wait_until_succeeds("pgrep -x swaylock") + machine.wait_until_succeeds("pgrep -xf swaylock") machine.sleep(3) machine.send_chars("${nodes.machine.config.users.users.alice.password}") machine.send_key("ret") - machine.wait_until_fails("pgrep -x swaylock") + machine.wait_until_fails("pgrep -xf swaylock") # Exit Sway and verify process exit status 0: swaymsg("exit", succeed=False) - machine.wait_until_fails("pgrep -x sway") + machine.wait_until_fails("pgrep -xf sway") machine.wait_for_file("/tmp/sway-exit-ok") ''; } diff --git a/nixos/tests/swayfx.nix b/nixos/tests/swayfx.nix index ba8408e20460..7fa5c602f520 100644 --- a/nixos/tests/swayfx.nix +++ b/nixos/tests/swayfx.nix @@ -190,15 +190,15 @@ import ./make-test-python.nix ( machine.screenshot("sway_exit") swaymsg("exec swaylock") - machine.wait_until_succeeds("pgrep -x swaylock") + machine.wait_until_succeeds("pgrep -xf swaylock") machine.sleep(3) machine.send_chars("${nodes.machine.users.users.alice.password}") machine.send_key("ret") - machine.wait_until_fails("pgrep -x swaylock") + machine.wait_until_fails("pgrep -xf swaylock") # Exit Sway and verify process exit status 0: swaymsg("exit", succeed=False) - machine.wait_until_fails("pgrep -x sway") + machine.wait_until_fails("pgrep -xf sway") machine.wait_for_file("/tmp/sway-exit-ok") ''; }