diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2022-11-05 16:28:58 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-05 16:28:58 -0500 |
commit | 3d61013d166eb99174ba417cba4c8bc6568951e1 (patch) | |
tree | bb7f36e3d83e3e0b4b820b561413330b9fb2772a /pkgs/tools/graphics | |
parent | 4328e01447986fa8b8bfe1c6e5cdff99ad8054db (diff) | |
parent | b090a8c2517c7ee479f2e2a821bae6ec26f0f812 (diff) |
Merge pull request #199633 from aaronjheng/wallutils
wallutils: 5.11.1 -> 5.12.4
Diffstat (limited to 'pkgs/tools/graphics')
-rw-r--r-- | pkgs/tools/graphics/wallutils/default.nix | 43 |
1 files changed, 32 insertions, 11 deletions
diff --git a/pkgs/tools/graphics/wallutils/default.nix b/pkgs/tools/graphics/wallutils/default.nix index 8ab6bba1ef125..67c325eb26af9 100644 --- a/pkgs/tools/graphics/wallutils/default.nix +++ b/pkgs/tools/graphics/wallutils/default.nix @@ -1,35 +1,56 @@ -{ buildGoPackage, fetchFromGitHub, lib +{ lib +, buildGoModule +, fetchFromGitHub , pkg-config -, wayland, libX11, xbitmaps, libXcursor, libXmu, libXpm, libheif +, wayland +, libX11 +, xbitmaps +, libXcursor +, libXmu +, libXpm +, libheif }: -buildGoPackage rec { +buildGoModule rec { pname = "wallutils"; - version = "5.11.1"; + version = "5.12.4"; src = fetchFromGitHub { owner = "xyproto"; repo = "wallutils"; rev = version; - sha256 = "sha256-FL66HALXsf7shoUKIZp6HORyuxhOfgTrY+PQAe92yk8="; + sha256 = "sha256-NODG4Lw/7X1aoT+dDSWxWEbDX6EAQzzDJPwsWOLaJEM="; }; - goPackagePath = "github.com/xyproto/wallutils"; + vendorSha256 = null; patches = [ ./lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch ]; - postPatch = '' - # VersionString is sometimes not up-to-date: - sed -iE 's/VersionString = "[0-9].[0-9].[0-9]"/VersionString = "${version}"/' wallutils.go - ''; + excludedPackages = [ + "./pkg/event/cmd" # Development tools + ]; + + ldflags = [ "-s" "-w" ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ wayland libX11 xbitmaps libXcursor libXmu libXpm libheif ]; + preCheck = + let skippedTests = [ + "TestClosest" # Requiring Wayland or X. + "TestNewSimpleEvent" # Blocking + "TestEveryMinute" # Blocking + ]; in + '' + export XDG_RUNTIME_DIR=`mktemp -d` + + buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]") + ''; + meta = with lib; { description = "Utilities for handling monitors, resolutions, and (timed) wallpapers"; inherit (src.meta) homepage; - license = licenses.mit; + license = licenses.bsd3; maintainers = with maintainers; [ ]; platforms = platforms.linux; }; |