From 63a4f9f24214ee9c152ff3687dc26cadbfb4939d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 30 Jan 2023 19:32:21 +0800 Subject: [PATCH] cinnamon.cinnamon-common: use mesa instead of clutter This is probably a mistake I made when bumping cinnamon to 5.4. What cinnamon needs is muffin-clutter-0, the clutter package itself is something no longer maintained. We just add the missing mesa for the EGL/eglmesaext.h header. --- pkgs/desktops/cinnamon/cinnamon-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index e241d8048f57..36f49c828f2a 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -7,7 +7,6 @@ , cinnamon-session , cinnamon-translations , cjs -, clutter , fetchFromGitHub , gdk-pixbuf , gettext @@ -23,6 +22,7 @@ , libstartup_notification , libXtst , libXdamage +, mesa , muffin , networkmanager , pkg-config @@ -89,7 +89,6 @@ stdenv.mkDerivation rec { cinnamon-desktop cinnamon-menus cjs - clutter dbus gdk-pixbuf glib @@ -100,6 +99,7 @@ stdenv.mkDerivation rec { libstartup_notification libXtst libXdamage + mesa muffin networkmanager polkit