public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnome3.mutter: 3.32.2 -> 3.34.0

This commit is contained in:
Tor Hedin Brønner 2019-09-09 21:47:10 +02:00
parent 894df0c2bb
commit f01d9db504
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/desktops/gnome-3/core/mutter/default.nix
View File

@ -7,22 +7,25 @@
, xorgserver , xorgserver
, python3 , python3
, wrapGAppsHook , wrapGAppsHook
, sysprof
, desktop-file-utils
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mutter"; pname = "mutter";
version = "3.32.2"; version = "3.34.0";
outputs = [ "out" "dev" "man" ]; outputs = [ "out" "dev" "man" ];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1h577i2ap7dpfy1jg101jvc6nzccc0csgvd55ahydlr8f94frcva"; sha256 = "0qdpw0fya8kr5737jf635455qb714wvhszkk82rlw48fqj8nk8ss";
}; };
mesonFlags = [ mesonFlags = [
"-Dxwayland-path=${xwayland}/bin/Xwayland" "-Dxwayland-path=${xwayland}/bin/Xwayland"
"-Dinstalled_tests=false" # TODO: enable these "-Dinstalled_tests=false" # TODO: enable these
"-Dprofiler=false"
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -39,6 +42,7 @@ stdenv.mkDerivation rec {
# for cvt command # for cvt command
xorgserver xorgserver
wrapGAppsHook wrapGAppsHook
desktop-file-utils
]; ];
buildInputs = [ buildInputs = [
@ -47,21 +51,19 @@ stdenv.mkDerivation rec {
geocode-glib libinput libgudev libwacom geocode-glib libinput libgudev libwacom
libcanberra-gtk3 zenity xkeyboard_config libxkbfile libcanberra-gtk3 zenity xkeyboard_config libxkbfile
libxkbcommon pipewire xwayland libxkbcommon pipewire xwayland
gnome-settings-daemon gnome-settings-daemon # sysprof
]; ];
patches = [ patches = [
(fetchpatch {
name = "ensure-emit-x11-display-opened.patch";
url = "https://gitlab.gnome.org/GNOME/mutter/commit/850ef518795dcc20d3b9a4f661f70ff8d0ddacb2.patch";
sha256 = "0cxdbrbcc8kfkvw7ryxjm2v1vk15jki7bawn128385r5hasabhxf";
})
(substituteAll { (substituteAll {
src = ./fix-paths.patch; src = ./fix-paths.patch;
inherit zenity; 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 = '' postPatch = ''