From 708dc43f9e7691db1f2026a88df40fc1e9418ea2 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 15 Oct 2025 10:04:28 +0200 Subject: [PATCH 1/2] equilux-theme: drop gnome-themes-extra dependency This does not change the resulting build. --- pkgs/by-name/eq/equilux-theme/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/eq/equilux-theme/package.nix b/pkgs/by-name/eq/equilux-theme/package.nix index 785c3e0f68bd..04a6bd2032d2 100644 --- a/pkgs/by-name/eq/equilux-theme/package.nix +++ b/pkgs/by-name/eq/equilux-theme/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, gnome-shell, - gnome-themes-extra, glib, libxml2, gtk-engine-murrine, @@ -30,7 +29,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome-themes-extra gdk-pixbuf librsvg ]; From 8803be75c3b145d73f587b074dd85c5441e7b8d4 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 15 Oct 2025 10:04:59 +0200 Subject: [PATCH 2/2] equilux-theme: modernize derivation --- pkgs/by-name/eq/equilux-theme/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/eq/equilux-theme/package.nix b/pkgs/by-name/eq/equilux-theme/package.nix index 04a6bd2032d2..4dc7b7fff8db 100644 --- a/pkgs/by-name/eq/equilux-theme/package.nix +++ b/pkgs/by-name/eq/equilux-theme/package.nix @@ -11,15 +11,15 @@ bc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "equilux-theme"; version = "20181029"; src = fetchFromGitHub { owner = "ddnexus"; repo = "equilux-theme"; - rev = "equilux-v${version}"; - sha256 = "0lv2yyxhnmnkwxp576wnb01id4fp734b5z5n0l67sg5z7vc2h8fc"; + tag = "equilux-v${finalAttrs.version}"; + hash = "sha256-zCEo2D6/PH0MBbb8ssg415EWA1iWm1Nu59NWC7v3YlM="; }; nativeBuildInputs = [ @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { rm $out/share/themes/*/COPYING ''; - meta = with lib; { - inherit (src.meta) homepage; + meta = { + inherit (finalAttrs.src.meta) homepage; description = "Material Design theme for GNOME/GTK based desktop environments"; - license = licenses.gpl2; - platforms = platforms.all; - maintainers = [ maintainers.fpletz ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.fpletz ]; }; -} +})