git.iko.soy/typeable/nixpkgs
on master help sign in
gnome3.mutter: clean up

* upower no longer used – https://gitlab.gnome.org/GNOME/mutter/commit/fa9e330f2c6d3ec34ff57b2c67a9c75c09401014 * only libcanbera, not libcanberra-gtk is used * cogl has been in-tree for ages * geocode-glib has not been used ever? * no need to have zenity in buildInputs, it is only needed in patch * move patches attr after src

commit4a48684965b9ecc12ded7f9360b673dc7a9484ab authorJan Tojnar <jtojnar@gmail.com> dateMon 13 Jul 2020, 10:13 (6 years ago) parentb491020
1 file changed+13−21
pkgs/desktops/gnome-3/core/mutter/default.nix+13−21
pkgs/desktops/gnome-3/core/mutter/default.nix+13−21
@@ -6,14 +6,12 @@
66, gnome3
77, gettext
88, gobject-introspection
9−, upower
109, cairo
1110, pango
12−, cogl
1311, json-glib
1412, libstartup_notification
1513, zenity
16−, libcanberra-gtk3
14+, libcanberra
1715, ninja
1816, xkeyboard_config
1917, libxkbfile
@@ -24,7 +22,6 @@
2422, glib
2523, gtk3
2624, gnome-desktop
27−, geocode-glib
2825, pipewire
2926, libgudev
3027, libwacom
@@ -53,6 +50,17 @@ stdenv.mkDerivation rec {
5350 sha256 = "0p3jglw6f2h67kwk89qz1rz23y25lip8m2mp2xshf2vrg4a930as";
5451 };
5552
53+ patches = [
54+ # Drop inheritable cap_sys_nice, to prevent the ambient set from leaking
55+ # from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381
56+ ./drop-inheritable.patch
57+
58+ (substituteAll {
59+ src = ./fix-paths.patch;
60+ inherit zenity;
61+ })
62+ ];
63+
5664 mesonFlags = [
5765 "-Degl_device=true"
5866 "-Dinstalled_tests=false" # TODO: enable these
@@ -85,16 +93,14 @@ stdenv.mkDerivation rec {
8593
8694 buildInputs = [
8795 cairo
88− cogl
8996 egl-wayland
90− geocode-glib
9197 glib
9298 gnome-desktop
9399 gnome-settings-daemon
94100 gobject-introspection
95101 gsettings-desktop-schemas
96102 gtk3
97− libcanberra-gtk3
103+ libcanberra
98104 libgudev
99105 libinput
100106 libstartup_notification
@@ -104,25 +110,11 @@ stdenv.mkDerivation rec {
104110 pango
105111 pipewire
106112 sysprof
107− upower
108113 xkeyboard_config
109114 xwayland
110− zenity
111− zenity
112115 wayland-protocols
113116 ];
114117
115− patches = [
116− # Drop inheritable cap_sys_nice, to prevent the ambient set from leaking
117− # from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381
118− ./drop-inheritable.patch
119−
120− (substituteAll {
121− src = ./fix-paths.patch;
122− inherit zenity;
123− })
124− ];
125−
126118 postPatch = ''
127119 patchShebangs src/backends/native/gen-default-modes.py
128120 '';