diff options
author | Vladimír Čunát <v@cunat.cz> | 2024-05-05 17:31:58 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2024-05-05 17:31:58 +0200 |
commit | 93947b281226d5d89a39073b10caaf6c906070aa (patch) | |
tree | d55f8944fd90a3dd0d86e0f495f3d0bbdf795060 /pkgs/tools/graphics | |
parent | 5dc079ed333c755fe000f2b86e97bf11f6f069a4 (diff) | |
parent | 100509c030faf7cca1582c5a7197b8d3a815d600 (diff) |
Merge branch 'staging' into staging-next
Diffstat (limited to 'pkgs/tools/graphics')
-rw-r--r-- | pkgs/tools/graphics/wallutils/default.nix | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/pkgs/tools/graphics/wallutils/default.nix b/pkgs/tools/graphics/wallutils/default.nix index 796baa25b0bf2..e8abeebfec2e8 100644 --- a/pkgs/tools/graphics/wallutils/default.nix +++ b/pkgs/tools/graphics/wallutils/default.nix @@ -48,17 +48,19 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; - preCheck = - let skippedTests = [ - "TestClosest" # Requiring Wayland or X - "TestEveryMinute" # Blocking - "TestNewSimpleEvent" # Blocking - ]; in - '' - export XDG_RUNTIME_DIR=`mktemp -d` + preCheck = '' + export XDG_RUNTIME_DIR=$(mktemp -d) + ''; - buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]") - ''; + checkFlags = + let + skippedTests = [ + "TestClosest" # Requiring Wayland or X + "TestEveryMinute" # Blocking + "TestNewSimpleEvent" # Blocking + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; meta = { description = "Utilities for handling monitors, resolutions, and (timed) wallpapers"; |