aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/desktops/gnome-3/core/mutter/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/desktops/gnome-3/core/mutter/default.nix')
-rw-r--r--nixpkgs/pkgs/desktops/gnome-3/core/mutter/default.nix18
1 files changed, 8 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/mutter/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/mutter/default.nix
index eab0b131ea9..c8b1ac7e466 100644
--- a/nixpkgs/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -7,17 +7,19 @@
, xorgserver
, python3
, wrapGAppsHook
+, sysprof
+, desktop-file-utils
}:
stdenv.mkDerivation rec {
pname = "mutter";
- version = "3.32.2";
+ version = "3.34.1";
outputs = [ "out" "dev" "man" ];
src = fetchurl {
url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1h577i2ap7dpfy1jg101jvc6nzccc0csgvd55ahydlr8f94frcva";
+ sha256 = "13kmmgg2zizr0522clwc2zn3bkwbir503b1wjiiixf5xi37jc65s";
};
mesonFlags = [
@@ -39,6 +41,7 @@ stdenv.mkDerivation rec {
# for cvt command
xorgserver
wrapGAppsHook
+ desktop-file-utils
];
buildInputs = [
@@ -47,21 +50,16 @@ stdenv.mkDerivation rec {
geocode-glib libinput libgudev libwacom
libcanberra-gtk3 zenity xkeyboard_config libxkbfile
libxkbcommon pipewire xwayland
- gnome-settings-daemon
+ gnome-settings-daemon sysprof
];
patches = [
+ # TODO: submit upstream
+ ./0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch
(substituteAll {
src = ./fix-paths.patch;
inherit zenity;
})
- # Fix a segmentation fault in dri_flush_front_buffer() upon
- # suspend/resume. This change should be removed when Mutter
- # is updated to 3.34.
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/mutter/commit/8307c0f7ab60760de53f764e6636893733543be8.diff";
- sha256 = "1hzfva71xdqvvnx5smjsrjlgyrmc7dj94mpylkak0gwda5si0h2n";
- })
];
postPatch = ''