wallutils: init at 5.7.2 (#59878)

This commit is contained in:
Michael Weiss 2019-04-19 21:43:04 +02:00 committed by GitHub
parent c793258a88
commit e34c5309b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 61 additions and 0 deletions

View File

@ -0,0 +1,34 @@
{ buildGoModule, fetchFromGitHub, lib
, wayland, libX11, xbitmaps, libXcursor, libXmu
}:
buildGoModule rec {
name = "wallutils-${version}";
version = "5.7.2";
src = fetchFromGitHub {
owner = "xyproto";
repo = "wallutils";
rev = version;
sha256 = "1q4487s83iwwgd40hkihpns84ya8mg54zp63ag519cdjizz38xyi";
};
modSha256 = "0kj9s9ymd99a5w9r1d997qysnzlgpnmh5dnki33h1jlwz47nwkld";
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
'';
buildInputs = [ wayland libX11 xbitmaps libXcursor libXmu ];
meta = with lib; {
description = "Utilities for handling monitors, resolutions, and (timed) wallpapers";
inherit (src.meta) homepage;
license = licenses.mit;
maintainers = with maintainers; [ primeos ];
platforms = platforms.linux;
};
}

View File

@ -0,0 +1,25 @@
From 9d064428cec970ced9be6753d6250b20a45a9fe2 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 19 Apr 2019 11:56:50 +0200
Subject: [PATCH] lscollection: Add NixOS paths to DefaultWallpaperDirectories
---
collections.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/collections.go b/collections.go
index ef74ea6..9f9a608 100644
--- a/collections.go
+++ b/collections.go
@@ -21,7 +21,7 @@ const (
)
var (
- DefaultWallpaperDirectories = []string{"/usr/share/pixmaps", "/usr/share/wallpapers", "/usr/share/backgrounds", "/usr/local/share/pixmaps", "/usr/local/share/wallpapers", "/usr/local/share/backgrounds", "/usr/share/archlinux"}
+ DefaultWallpaperDirectories = []string{"/run/current-system/sw/share/pixmaps", "/run/current-system/sw/share/wallpapers", "/run/current-system/sw/share/backgrounds", "/usr/share/pixmaps", "/usr/share/wallpapers", "/usr/share/backgrounds", "/usr/local/share/pixmaps", "/usr/local/share/wallpapers", "/usr/local/share/backgrounds", "/usr/share/archlinux"}
)
type SearchResults struct {
--
2.19.2

View File

@ -2561,6 +2561,8 @@ in
inherit (pythonPackages) sphinx;
};
wallutils = callPackage ../tools/graphics/wallutils { };
wl-clipboard = callPackage ../tools/misc/wl-clipboard { };
zabbix-cli = callPackage ../tools/misc/zabbix-cli { };