diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-19 10:53:44 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-19 10:53:44 +0100 |
| commit | f6b39f852e0a9eb35a7434f02e5579c15519c41c (patch) | |
| tree | 8af93c37d0e1ec97607e92ba1926ce24ed744040 /pkgs/tools/graphics | |
| parent | ed9fb90b2855fe09772958494a611248cc23a89c (diff) | |
| parent | 41d921292e922a6cd1aba64259341c244d4c2cc7 (diff) | |
| download | nixpkgs-f6b39f852e0a9eb35a7434f02e5579c15519c41c.tar nixpkgs-f6b39f852e0a9eb35a7434f02e5579c15519c41c.tar.gz nixpkgs-f6b39f852e0a9eb35a7434f02e5579c15519c41c.tar.bz2 nixpkgs-f6b39f852e0a9eb35a7434f02e5579c15519c41c.tar.lz nixpkgs-f6b39f852e0a9eb35a7434f02e5579c15519c41c.tar.xz nixpkgs-f6b39f852e0a9eb35a7434f02e5579c15519c41c.tar.zst nixpkgs-f6b39f852e0a9eb35a7434f02e5579c15519c41c.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/graphics')
| -rw-r--r-- | pkgs/tools/graphics/wallutils/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/graphics/wallutils/lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch | 29 |
2 files changed, 17 insertions, 16 deletions
diff --git a/pkgs/tools/graphics/wallutils/default.nix b/pkgs/tools/graphics/wallutils/default.nix index 80b90e8e6b2..263425aef1d 100644 --- a/pkgs/tools/graphics/wallutils/default.nix +++ b/pkgs/tools/graphics/wallutils/default.nix @@ -4,13 +4,13 @@ buildGoPackage rec { pname = "wallutils"; - version = "5.8.2"; + version = "5.8.3"; src = fetchFromGitHub { owner = "xyproto"; repo = "wallutils"; rev = version; - sha256 = "1ghvcxsy5prj8l38r4lg39imsqbwmvn1zmiv7004j6skmgpaaawh"; + sha256 = "1cc0bb6bdh3pm9mf6rcgk9myr62xhqc6l84xgw44lhm6hkkp16gb"; }; goPackagePath = "github.com/xyproto/wallutils"; diff --git a/pkgs/tools/graphics/wallutils/lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch b/pkgs/tools/graphics/wallutils/lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch index 00aeed6363e..77c55b35c96 100644 --- a/pkgs/tools/graphics/wallutils/lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch +++ b/pkgs/tools/graphics/wallutils/lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch @@ -1,25 +1,26 @@ -From 9d064428cec970ced9be6753d6250b20a45a9fe2 Mon Sep 17 00:00:00 2001 +From 2643b06889605e6096174fb48dcb64a49b252217 Mon Sep 17 00:00:00 2001 From: Michael Weiss <dev.primeos@gmail.com> -Date: Fri, 19 Apr 2019 11:56:50 +0200 +Date: Sun, 17 Nov 2019 20:30:08 +0100 Subject: [PATCH] lscollection: Add NixOS paths to DefaultWallpaperDirectories --- - collections.go | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + collections.go | 3 +++ + 1 file changed, 3 insertions(+) diff --git a/collections.go b/collections.go -index ef74ea6..9f9a608 100644 +index be04d41..cc79c56 100644 --- a/collections.go +++ b/collections.go -@@ -21,7 +21,7 @@ const ( - ) +@@ -22,6 +22,9 @@ 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 { + // DefaultWallpaperDirectories lists the default locations to look for wallpapers + var 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", -- -2.19.2 +2.23.0 |