diff options
Diffstat (limited to 'pkgs/desktops/gnome/core/mutter')
-rw-r--r-- | pkgs/desktops/gnome/core/mutter/43/default.nix | 16 | ||||
-rw-r--r-- | pkgs/desktops/gnome/core/mutter/default.nix | 10 |
2 files changed, 22 insertions, 4 deletions
diff --git a/pkgs/desktops/gnome/core/mutter/43/default.nix b/pkgs/desktops/gnome/core/mutter/43/default.nix index 1d07bf167c80..e565603ae576 100644 --- a/pkgs/desktops/gnome/core/mutter/43/default.nix +++ b/pkgs/desktops/gnome/core/mutter/43/default.nix @@ -67,6 +67,18 @@ stdenv.mkDerivation (finalAttrs: { url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/285a5a4d54ca83b136b787ce5ebf1d774f9499d5.patch"; sha256 = "/npUE3idMSTVlFptsDpZmGWjZ/d2gqruVlJKq4eF4xU="; }) + + # Remove support for window shading. + # The corresponding key was removed in gsettings-desktop-schemas 45.alpha. + # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2884 + # + # Fetch the patch from magpie as they share same code base and this feature + # is never supported on wayland (note that magpie 0.9.x won't support wayland). + # https://github.com/BuddiesOfBudgie/magpie/issues/9 + (fetchpatch { + url = "https://github.com/BuddiesOfBudgie/magpie/commit/4177c466375462ca8ed8fdb60913df4422f19144.patch"; + sha256 = "NVx40WDnlUL050D529KVohvNBdVrheXxmJ73U3+KSeQ="; + }) ]; mesonFlags = [ @@ -136,6 +148,10 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs src/backends/native/gen-default-modes.py + + # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3187 + substituteInPlace meson.build \ + --replace "dependency('sysprof-4')" "dependency('sysprof-6')" ''; postInstall = '' diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index d9aa514bb0e6..119ee0efeb54 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -35,6 +35,7 @@ , libXau , libinput , libdrm +, libei , gsettings-desktop-schemas , glib , atk @@ -66,13 +67,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mutter"; - version = "44.5"; + version = "45.2"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; - sha256 = "8kfg7WXrYvKwd1RtUoPtbUf0Ar2mpDFkE1AdjK7Slnk="; + sha256 = "rz+Ym/IqVg3CSS+44Z+do3zm1xRLPgUZgLDVUFiWANw="; }; mesonFlags = [ @@ -123,6 +124,7 @@ stdenv.mkDerivation (finalAttrs: { harfbuzz libcanberra libdrm + libei libgudev libinput libstartup_notification @@ -170,7 +172,7 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. # TODO: Move this into a directory devhelp can find. - moveToOutput "share/mutter-12/doc" "$devdoc" + moveToOutput "share/mutter-13/doc" "$devdoc" ''; # Install udev files into our own tree. @@ -179,7 +181,7 @@ stdenv.mkDerivation (finalAttrs: { separateDebugInfo = true; passthru = { - libdir = "${finalAttrs.finalPackage}/lib/mutter-12"; + libdir = "${finalAttrs.finalPackage}/lib/mutter-13"; tests = { libdirExists = runCommand "mutter-libdir-exists" {} '' |