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

gnome3.mutter: backport patches from gnome-3-34 branch

Browse Source 
There's probably other fixes people would be interested in
like https://gitlab.gnome.org/GNOME/mutter/merge_requests/943.

Fixes #74934
This commit is contained in:
worldofpeace 2019-12-04 16:51:56 -05:00
parent 903c57a365
commit 43b1e5d998
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,20 +105,34 @@ stdenv.mkDerivation rec {
]; ];
patches = [ patches = [
# Drop inheritable cap_sys_nice, to prevent the ambient set from leaking # Fixes from gnome-3-34 branch 2019-11-29.
# from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381 (fetchpatch {
./drop-inheritable.patch name = "gnome-3-34-2019-11-29.patch";
# TODO: submit upstream url = "https://github.com/GNOME/mutter/compare/3.34.1...c0e76186da5b7baf7c8804c0ffa80232a5a6bf98.patch";
./0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch excludes = [
(substituteAll { ".gitlab-ci.yml"
src = ./fix-paths.patch; ".gitlab-ci/checkout-gnome-shell.sh"
inherit zenity; ];
sha256 = "1qmxic83bd3dvg6isipqy8jaaksd7p5s3cb7h44zinq738n8d0fb";
}) })
# Fix build with libglvnd provided headers # Fix build with libglvnd provided headers
(fetchpatch { (fetchpatch {
url = "https://gitlab.gnome.org/GNOME/mutter/commit/a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90.patch"; url = "https://gitlab.gnome.org/GNOME/mutter/commit/a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90.patch";
sha256 = "0imy2j8af9477jliwdq4jc40yw1cifsjjf196gnmwxr9rkj0hbrd"; 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;
})
]; ];
postPatch = '' postPatch = ''