Skip to content

Commit 12768aa

Browse files
gruvbox-plus-icons: 5.5.0 -> 6.2.0 (#372925)
2 parents 38de221 + 36e6ae8 commit 12768aa

File tree

2 files changed

+43
-15
lines changed

2 files changed

+43
-15
lines changed
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/scripts/folders-color-chooser b/scripts/folders-color-chooser
2+
index 749725212..989bdf78c 100755
3+
--- a/scripts/folders-color-chooser
4+
+++ b/scripts/folders-color-chooser
5+
@@ -33,6 +33,8 @@ icon_pack_path() {
6+
echo "${XDG_DATA_HOME:-"${HOME}/.local/share"}/icons/${icon_pack_theme}"
7+
elif [[ -d "${HOME}/.icons/${icon_pack_theme}" ]]; then
8+
echo "${HOME}/.icons/${icon_pack_theme}"
9+
+ elif [[ -d "$out/share/icons/${icon_pack_theme}" ]]; then
10+
+ echo "$out/share/icons/${icon_pack_theme}"
11+
else
12+
data_dirs=$(echo "${XDG_DATA_DIRS:-"/usr/local/share:/usr/share"}" | tr ":" "\n")
13+
for path in $data_dirs; do
Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,43 @@
11
{
2-
lib
3-
, stdenvNoCC
4-
, fetchFromGitHub
5-
, gtk3
6-
, plasma5Packages
7-
, gnome-icon-theme
8-
, hicolor-icon-theme
2+
lib,
3+
stdenvNoCC,
4+
fetchFromGitHub,
5+
gtk3,
6+
plasma5Packages,
7+
gnome-icon-theme,
8+
hicolor-icon-theme,
9+
nix-update-script,
10+
folder-color ? "plasma", # Supported colors: black blue caramel citron firebrick gold green grey highland jade lavender lime olive orange pistachio plasma pumpkin purple red rust sapphire tomato violet white yellow
911
}:
1012

1113
stdenvNoCC.mkDerivation (finalAttrs: {
1214
pname = "gruvbox-plus-icons";
13-
version = "5.5.0";
15+
version = "6.2.0";
1416

1517
src = fetchFromGitHub {
1618
owner = "SylEleuth";
1719
repo = "gruvbox-plus-icon-pack";
18-
rev = "v${finalAttrs.version}";
19-
hash = "sha256-G7F+69K2aJVBM3yOQIMTH2pDXBfLmYScKIIAza3YNw8=";
20+
tag = "v${finalAttrs.version}";
21+
hash = "sha256-MCof2CFQfh/ChFNlsxw9BmrFf1A804HzWoHJdNsrW74=";
2022
};
2123

24+
patches = [ ./folder-color.patch ];
25+
2226
nativeBuildInputs = [ gtk3 ];
2327

24-
propagatedBuildInputs = [ plasma5Packages.breeze-icons gnome-icon-theme hicolor-icon-theme ];
28+
propagatedBuildInputs = [
29+
plasma5Packages.breeze-icons
30+
gnome-icon-theme
31+
hicolor-icon-theme
32+
];
2533

2634
installPhase = ''
2735
runHook preInstall
2836
2937
mkdir -p $out/share/icons
3038
cp -r Gruvbox-Plus-Dark $out/share/icons/
39+
patchShebangs scripts/folders-color-chooser
40+
./scripts/folders-color-chooser -c ${folder-color}
3141
gtk-update-icon-cache $out/share/icons/Gruvbox-Plus-Dark
3242
3343
runHook postInstall
@@ -37,11 +47,16 @@ stdenvNoCC.mkDerivation (finalAttrs: {
3747
dontBuild = true;
3848
dontConfigure = true;
3949

40-
meta = with lib; {
50+
passthru.updateScript = nix-update-script { };
51+
52+
meta = {
4153
description = "Icon pack for Linux desktops based on the Gruvbox color scheme";
4254
homepage = "https://github.com/SylEleuth/gruvbox-plus-icon-pack";
43-
license = licenses.gpl3Only;
44-
platforms = platforms.linux;
45-
maintainers = with maintainers; [ eureka-cpu ];
55+
license = lib.licenses.gpl3Only;
56+
platforms = lib.platforms.linux;
57+
maintainers = with lib.maintainers; [
58+
eureka-cpu
59+
Gliczy
60+
];
4661
};
4762
})

0 commit comments

Comments
 (0)