diff --git a/pkgs/by-name/ev/everforest-gtk-theme/fix-install-script.patch b/pkgs/by-name/ev/everforest-gtk-theme/fix-install-script.patch new file mode 100644 index 000000000000..75634c5eb77a --- /dev/null +++ b/pkgs/by-name/ev/everforest-gtk-theme/fix-install-script.patch @@ -0,0 +1,34 @@ +From f9be45b024e29efa6082cdfe6f47ca6b1110f20a Mon Sep 17 00:00:00 2001 +From: poz +Date: Fri, 9 Jan 2026 03:25:01 +0100 +Subject: [PATCH] fix install script + +--- + themes/install.sh | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/themes/install.sh b/themes/install.sh +index 1dc573f1..b1657b62 100755 +--- a/themes/install.sh ++++ b/themes/install.sh +@@ -130,6 +130,7 @@ install() { + ln -s assets/no-events.svg no-events.svg + ln -s assets/process-working.svg process-working.svg + ln -s assets/no-notifications.svg no-notifications.svg ++ cd - > /dev/null + + # GTK2 Themes + mkdir -p "${THEME_DIR}/gtk-2.0" +@@ -166,7 +167,11 @@ install() { + cp -r "${SRC_DIR}/main/metacity-1/metacity-theme-3${window}${color}.xml" "${THEME_DIR}/metacity-1/metacity-theme-3.xml" + cp -r "${SRC_DIR}/assets/metacity-1/assets${window}" "${THEME_DIR}/metacity-1/assets" + cp -r "${SRC_DIR}/assets/metacity-1/thumbnail${ELSE_DARK:-}.png" "${THEME_DIR}/metacity-1/thumbnail.png" +- cd "${THEME_DIR}/metacity-1" && ln -s metacity-theme-3.xml metacity-theme-1.xml && ln -s metacity-theme-3.xml metacity-theme-2.xml ++ ++ cd "${THEME_DIR}/metacity-1" ++ ln -s metacity-theme-3.xml metacity-theme-1.xml ++ ln -s metacity-theme-3.xml metacity-theme-2.xml ++ cd - > /dev/null + + # XFWM4 Themes + mkdir -p "${THEME_DIR}/xfwm4" diff --git a/pkgs/by-name/ev/everforest-gtk-theme/package.nix b/pkgs/by-name/ev/everforest-gtk-theme/package.nix index 7bb210b045fc..fb5e6f71769f 100644 --- a/pkgs/by-name/ev/everforest-gtk-theme/package.nix +++ b/pkgs/by-name/ev/everforest-gtk-theme/package.nix @@ -4,19 +4,27 @@ fetchFromGitHub, gnome-themes-extra, gtk-engine-murrine, + gtk3, + sassc, }: stdenvNoCC.mkDerivation { pname = "everforest-gtk-theme"; - version = "0-unstable-2025-10-15"; + version = "0-unstable-2025-10-23"; src = fetchFromGitHub { owner = "Fausto-Korpsvart"; repo = "Everforest-GTK-Theme"; - rev = "930a5dc57f7a06e8c6538d531544e41c56dbb27a"; - hash = "sha256-mlJE7gVElWUjJIZnAL5ztchphmaU82llol+YdKqnSxg="; + rev = "9b8be4d6648ae9eaae3dd550105081f8c9054825"; + hash = "sha256-XHO6NoXJwwZ8gBzZV/hJnVq5BvkEKYWvqLBQT00dGdE="; }; + patches = [ + # remove when merged + # https://github.com/Fausto-Korpsvart/Everforest-GTK-Theme/pull/34 + ./fix-install-script.patch + ]; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; @@ -25,13 +33,34 @@ stdenvNoCC.mkDerivation { gnome-themes-extra ]; + nativeBuildInputs = [ + gtk3 + sassc + ]; + dontBuild = true; + dontFixup = true; + dontDropIconThemeCache = true; + + postPatch = '' + patchShebangs themes/install.sh + ''; installPhase = '' runHook preInstall + mkdir -p "$out/share/"{themes,icons} + cp -a icons/* "$out/share/icons/" - cp -a themes/* "$out/share/themes/" + + for theme in "$out/share/icons/"*; do + gtk-update-icon-cache "$theme" + done + + cd themes + ./install.sh --name Everforest --theme all --dest "$out/share/themes" + cd .. + runHook postInstall '';