diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-07-13 10:13:31 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2020-07-13 10:21:24 +0200 |
commit | 4a48684965b9ecc12ded7f9360b673dc7a9484ab (patch) | |
tree | dff2002c17ee0f4cb9ca2304d0aab35693eeb33e /pkgs/desktops/gnome-3 | |
parent | b49102008185a034288debe5726d7492fb56d163 (diff) | |
download | nixpkgs-4a48684965b9ecc12ded7f9360b673dc7a9484ab.tar nixpkgs-4a48684965b9ecc12ded7f9360b673dc7a9484ab.tar.gz nixpkgs-4a48684965b9ecc12ded7f9360b673dc7a9484ab.tar.bz2 nixpkgs-4a48684965b9ecc12ded7f9360b673dc7a9484ab.tar.lz nixpkgs-4a48684965b9ecc12ded7f9360b673dc7a9484ab.tar.xz nixpkgs-4a48684965b9ecc12ded7f9360b673dc7a9484ab.tar.zst nixpkgs-4a48684965b9ecc12ded7f9360b673dc7a9484ab.zip |
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
Diffstat (limited to 'pkgs/desktops/gnome-3')
-rw-r--r-- | pkgs/desktops/gnome-3/core/mutter/default.nix | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 569bde9b339..2a81c6fd23e 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -6,14 +6,12 @@ , gnome3 , gettext , gobject-introspection -, upower , cairo , pango -, cogl , json-glib , libstartup_notification , zenity -, libcanberra-gtk3 +, libcanberra , ninja , xkeyboard_config , libxkbfile @@ -24,7 +22,6 @@ , glib , gtk3 , gnome-desktop -, geocode-glib , pipewire , libgudev , libwacom @@ -53,6 +50,17 @@ stdenv.mkDerivation rec { sha256 = "0p3jglw6f2h67kwk89qz1rz23y25lip8m2mp2xshf2vrg4a930as"; }; + patches = [ + # 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 + + (substituteAll { + src = ./fix-paths.patch; + inherit zenity; + }) + ]; + mesonFlags = [ "-Degl_device=true" "-Dinstalled_tests=false" # TODO: enable these @@ -85,16 +93,14 @@ stdenv.mkDerivation rec { buildInputs = [ cairo - cogl egl-wayland - geocode-glib glib gnome-desktop gnome-settings-daemon gobject-introspection gsettings-desktop-schemas gtk3 - libcanberra-gtk3 + libcanberra libgudev libinput libstartup_notification @@ -104,25 +110,11 @@ stdenv.mkDerivation rec { pango pipewire sysprof - upower xkeyboard_config xwayland - zenity - zenity wayland-protocols ]; - patches = [ - # 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 - - (substituteAll { - src = ./fix-paths.patch; - inherit zenity; - }) - ]; - postPatch = '' patchShebangs src/backends/native/gen-default-modes.py ''; |