diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-12-04 16:51:56 -0500 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-12-04 16:51:56 -0500 |
| commit | 43b1e5d9981b3501c6303b573965c427e45e1379 (patch) | |
| tree | 941be23737378d60cdfd986827a9f575e45f68d5 /pkgs/desktops/gnome-3 | |
| parent | 903c57a365dae494371cc6179a4f06e7074cee6a (diff) | |
| download | nixlib-43b1e5d9981b3501c6303b573965c427e45e1379.tar nixlib-43b1e5d9981b3501c6303b573965c427e45e1379.tar.gz nixlib-43b1e5d9981b3501c6303b573965c427e45e1379.tar.bz2 nixlib-43b1e5d9981b3501c6303b573965c427e45e1379.tar.lz nixlib-43b1e5d9981b3501c6303b573965c427e45e1379.tar.xz nixlib-43b1e5d9981b3501c6303b573965c427e45e1379.tar.zst nixlib-43b1e5d9981b3501c6303b573965c427e45e1379.zip | |
gnome3.mutter: backport patches from gnome-3-34 branch
There's probably other fixes people would be interested in like https://gitlab.gnome.org/GNOME/mutter/merge_requests/943. Fixes #74934
Diffstat (limited to 'pkgs/desktops/gnome-3')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/mutter/default.nix | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 42490fa3e870..63136d95f812 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -105,20 +105,34 @@ stdenv.mkDerivation rec { ]; patches = [ + # Fixes from gnome-3-34 branch 2019-11-29. + (fetchpatch { + name = "gnome-3-34-2019-11-29.patch"; + url = "https://github.com/GNOME/mutter/compare/3.34.1...c0e76186da5b7baf7c8804c0ffa80232a5a6bf98.patch"; + excludes = [ + ".gitlab-ci.yml" + ".gitlab-ci/checkout-gnome-shell.sh" + ]; + sha256 = "1qmxic83bd3dvg6isipqy8jaaksd7p5s3cb7h44zinq738n8d0fb"; + }) + + # Fix build with libglvnd provided headers + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/commit/a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90.patch"; + sha256 = "0imy2j8af9477jliwdq4jc40yw1cifsjjf196gnmwxr9rkj0hbrd"; + }) + # Drop inheritable cap_sys_nice, to prevent the ambient set from leaking # from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381 ./drop-inheritable.patch + # TODO: submit upstream ./0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch + (substituteAll { src = ./fix-paths.patch; inherit zenity; }) - # Fix build with libglvnd provided headers - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/mutter/commit/a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90.patch"; - sha256 = "0imy2j8af9477jliwdq4jc40yw1cifsjjf196gnmwxr9rkj0hbrd"; - }) ]; postPatch = '' |