Merge pull request #199633 from aaronjheng/wallutils
wallutils: 5.11.1 -> 5.12.4
This commit is contained in:
commit
3d61013d16
1 changed files with 32 additions and 11 deletions
|
@ -1,35 +1,56 @@
|
||||||
{ buildGoPackage, fetchFromGitHub, lib
|
{ lib
|
||||||
|
, buildGoModule
|
||||||
|
, fetchFromGitHub
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, wayland, libX11, xbitmaps, libXcursor, libXmu, libXpm, libheif
|
, wayland
|
||||||
|
, libX11
|
||||||
|
, xbitmaps
|
||||||
|
, libXcursor
|
||||||
|
, libXmu
|
||||||
|
, libXpm
|
||||||
|
, libheif
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildGoPackage rec {
|
buildGoModule rec {
|
||||||
pname = "wallutils";
|
pname = "wallutils";
|
||||||
version = "5.11.1";
|
version = "5.12.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "xyproto";
|
owner = "xyproto";
|
||||||
repo = "wallutils";
|
repo = "wallutils";
|
||||||
rev = version;
|
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 ];
|
patches = [ ./lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch ];
|
||||||
|
|
||||||
postPatch = ''
|
excludedPackages = [
|
||||||
# VersionString is sometimes not up-to-date:
|
"./pkg/event/cmd" # Development tools
|
||||||
sed -iE 's/VersionString = "[0-9].[0-9].[0-9]"/VersionString = "${version}"/' wallutils.go
|
];
|
||||||
'';
|
|
||||||
|
ldflags = [ "-s" "-w" ];
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
buildInputs = [ wayland libX11 xbitmaps libXcursor libXmu libXpm libheif ];
|
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; {
|
meta = with lib; {
|
||||||
description = "Utilities for handling monitors, resolutions, and (timed) wallpapers";
|
description = "Utilities for handling monitors, resolutions, and (timed) wallpapers";
|
||||||
inherit (src.meta) homepage;
|
inherit (src.meta) homepage;
|
||||||
license = licenses.mit;
|
license = licenses.bsd3;
|
||||||
maintainers = with maintainers; [ ];
|
maintainers = with maintainers; [ ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue