diff options
| author | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2019-09-09 21:47:10 +0200 |
|---|---|---|
| committer | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2019-09-30 19:39:45 +0200 |
| commit | f01d9db50424fcdecdc031f558942302c2295e34 (patch) | |
| tree | 8d3341a81280afa83482c466584946032da3c35b /pkgs/desktops/gnome-3 | |
| parent | 894df0c2bb27f0a049dd53b7f9bbfd1597a8f580 (diff) | |
| download | nixlib-f01d9db50424fcdecdc031f558942302c2295e34.tar nixlib-f01d9db50424fcdecdc031f558942302c2295e34.tar.gz nixlib-f01d9db50424fcdecdc031f558942302c2295e34.tar.bz2 nixlib-f01d9db50424fcdecdc031f558942302c2295e34.tar.lz nixlib-f01d9db50424fcdecdc031f558942302c2295e34.tar.xz nixlib-f01d9db50424fcdecdc031f558942302c2295e34.tar.zst nixlib-f01d9db50424fcdecdc031f558942302c2295e34.zip | |
gnome3.mutter: 3.32.2 -> 3.34.0
Diffstat (limited to 'pkgs/desktops/gnome-3')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/mutter/default.nix | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index eab0b131ea93..8022a0b110c8 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -7,22 +7,25 @@ , xorgserver , python3 , wrapGAppsHook +, sysprof +, desktop-file-utils }: stdenv.mkDerivation rec { pname = "mutter"; - version = "3.32.2"; + version = "3.34.0"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1h577i2ap7dpfy1jg101jvc6nzccc0csgvd55ahydlr8f94frcva"; + sha256 = "0qdpw0fya8kr5737jf635455qb714wvhszkk82rlw48fqj8nk8ss"; }; mesonFlags = [ "-Dxwayland-path=${xwayland}/bin/Xwayland" "-Dinstalled_tests=false" # TODO: enable these + "-Dprofiler=false" ]; propagatedBuildInputs = [ @@ -39,6 +42,7 @@ stdenv.mkDerivation rec { # for cvt command xorgserver wrapGAppsHook + desktop-file-utils ]; buildInputs = [ @@ -47,21 +51,19 @@ 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 = [ + (fetchpatch { + name = "ensure-emit-x11-display-opened.patch"; + url = "https://gitlab.gnome.org/GNOME/mutter/commit/850ef518795dcc20d3b9a4f661f70ff8d0ddacb2.patch"; + sha256 = "0cxdbrbcc8kfkvw7ryxjm2v1vk15jki7bawn128385r5hasabhxf"; + }) (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 = '' |