From e410548128820439974ecfa611db8706de9ef5e6 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 12 Feb 2023 20:14:35 +0800
Subject: [PATCH 1/2] pantheon.gala: Use mesa instead of clutter

What gala needs is mutter-clutter-7, not clutter-1.0.
We just add the missing mesa for EGL/eglmesaext.h header.
---
 pkgs/desktops/pantheon/desktop/gala/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix
index 56428a9124ae..2a6c79666b3f 100644
--- a/pkgs/desktops/pantheon/desktop/gala/default.nix
+++ b/pkgs/desktops/pantheon/desktop/gala/default.nix
@@ -17,8 +17,8 @@
 , bamf
 , libcanberra-gtk3
 , gnome-desktop
+, mesa
 , mutter
-, clutter
 , gnome-settings-daemon
 , wrapGAppsHook
 , gexiv2
@@ -119,7 +119,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     bamf
-    clutter
     gnome-settings-daemon
     gexiv2
     gnome-desktop
@@ -127,6 +126,7 @@ stdenv.mkDerivation rec {
     gtk3
     libcanberra-gtk3
     libgee
+    mesa # for libEGL
     mutter
   ];
 

From a99531196862423e464b5f15f1dacb98c07534f9 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 12 Feb 2023 20:17:27 +0800
Subject: [PATCH 2/2] pantheon.elementary-greeter: Use mesa instead of
 clutter-gtk

Looks like the comment no longer applies.
We just add the missing mesa for EGL/eglmesaext.h header.
---
 pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
index 7598ab5ed818..94a6e533dda3 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
@@ -15,6 +15,7 @@
 , libgee
 , libhandy
 , gnome-settings-daemon
+, mesa
 , mutter
 , elementary-icon-theme
 , wingpanel-with-indicators
@@ -22,7 +23,6 @@
 , nixos-artwork
 , lightdm
 , gdk-pixbuf
-, clutter-gtk
 , dbus
 , accountsservice
 , wrapGAppsHook
@@ -59,7 +59,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     accountsservice
-    clutter-gtk # else we get could not generate cargs for mutter-clutter-2
     elementary-icon-theme
     gnome-settings-daemon
     gdk-pixbuf
@@ -68,6 +67,7 @@ stdenv.mkDerivation rec {
     libgee
     libhandy
     lightdm
+    mesa # for libEGL
     mutter
   ];