git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #93045 from jtojnar/gnome-shell-cleanup

gnome3.gnome-shell: clean up

commit82c91e13065dcffc9ef94492f8035436269e4b1a authorJan Tojnar <jtojnar@gmail.com> dateSat 18 Jul 2020, 06:51 (6 years ago) parent43259954a48684
2 files changed+149−65
pkgs/desktops/gnome-3/core/gnome-shell/default.nix+136−44 pkgs/desktops/gnome-3/core/mutter/default.nix+13−21
pkgs/desktops/gnome-3/core/gnome-shell/default.nix+136−44
@@ -1,60 +1,81 @@
1−{ fetchurl, fetchpatch, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, json-glib, gettext, libsecret
2−, python3, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core
3−, libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info
4−, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils
5−, libpulseaudio, libical, gobject-introspection, wrapGAppsHook, libxslt, gcr
6−, accountsservice, gdk-pixbuf, gdm, upower, ibus, libnma, libgnomekbd, gnome-desktop
7−, gsettings-desktop-schemas, gnome-keyring, glib, gjs, mutter, evolution-data-server, gtk3
8−, sassc, systemd, gst_all_1, adwaita-icon-theme, gnome-bluetooth, gnome-clocks, gnome-settings-daemon
9−, gnome-autoar, asciidoc-full
1+{ fetchurl
2+, fetchpatch
3+, substituteAll
4+, stdenv
5+, meson
6+, ninja
7+, pkg-config
8+, gnome3
9+, json-glib
10+, gettext
11+, libsecret
12+, python3
13+, polkit
14+, networkmanager
15+, gtk-doc
16+, docbook-xsl-nons
17+, at-spi2-core
18+, libstartup_notification
19+, telepathy-glib
20+, telepathy-logger
21+, unzip
22+, shared-mime-info
23+, libgweather
24+, librsvg
25+, geoclue2
26+, perl
27+, docbook_xml_dtd_412
28+, docbook_xml_dtd_42
29+, docbook_xml_dtd_43
30+, desktop-file-utils
31+, libpulseaudio
32+, libical
33+, gobject-introspection
34+, wrapGAppsHook
35+, libxslt
36+, gcr
37+, accountsservice
38+, gdk-pixbuf
39+, gdm
40+, upower
41+, ibus
42+, libnma
43+, libgnomekbd
44+, gnome-desktop
45+, gsettings-desktop-schemas
46+, gnome-keyring
47+, glib
48+, gjs
49+, mutter
50+, evolution-data-server
51+, gtk3
52+, sassc
53+, systemd
54+, gst_all_1
55+, adwaita-icon-theme
56+, gnome-bluetooth
57+, gnome-clocks
58+, gnome-settings-daemon
59+, gnome-autoar
60+, asciidoc-full
1061, bash-completion
1162}:
1263
1364# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup
14−
1565let
16− pythonEnv = python3.withPackages ( ps: with ps; [ pygobject3 ] );
17−
18−in stdenv.mkDerivation rec {
66+ pythonEnv = python3.withPackages (ps: with ps; [ pygobject3 ]);
67+in
68+stdenv.mkDerivation rec {
1969 pname = "gnome-shell";
2070 version = "3.36.4";
2171
72+ outputs = [ "out" "devdoc" ];
73+
2274 src = fetchurl {
2375 url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
2476 sha256 = "1nyibrr98ijn65z9ki0k7xzcwcliwy2jqssz0l0jalpbkhnr751d";
2577 };
2678
27− LANG = "en_US.UTF-8";
28−
29− nativeBuildInputs = [
30− meson ninja pkgconfig gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales
31− sassc desktop-file-utils libxslt.bin python3 asciidoc-full
32− ];
33− buildInputs = [
34− systemd
35− gsettings-desktop-schemas gnome-keyring glib gcr json-glib accountsservice
36− libsecret libsoup polkit gdk-pixbuf librsvg
37− networkmanager libstartup_notification telepathy-glib
38− libXtst gjs mutter libpulseaudio evolution-data-server
39− libical gtk3 gdm libcanberra-gtk3 geoclue2
40− adwaita-icon-theme gnome-bluetooth
41− gnome-clocks # schemas needed
42− at-spi2-core upower ibus gnome-desktop telepathy-logger gnome-settings-daemon
43− gobject-introspection
44− gnome-autoar
45−
46− # recording
47− gst_all_1.gstreamer
48− gst_all_1.gst-plugins-base
49− gst_all_1.gst-plugins-good
50−
51− # not declared at build time, but typelib is needed at runtime
52− libgweather libnma
53−
54− # for gnome-extension tool
55− bash-completion
56− ];
57−
5879 patches = [
5980 # Hardcode paths to various dependencies so that they can be found at runtime.
6081 (substituteAll {
@@ -86,6 +107,77 @@ in stdenv.mkDerivation rec {
86107 })
87108 ];
88109
110+ nativeBuildInputs = [
111+ meson
112+ ninja
113+ pkg-config
114+ gettext
115+ docbook-xsl-nons
116+ docbook_xml_dtd_412
117+ docbook_xml_dtd_42
118+ docbook_xml_dtd_43
119+ gtk-doc
120+ perl
121+ wrapGAppsHook
122+ sassc
123+ desktop-file-utils
124+ libxslt.bin
125+ python3
126+ asciidoc-full
127+ ];
128+
129+ buildInputs = [
130+ systemd
131+ gsettings-desktop-schemas
132+ gnome-keyring
133+ glib
134+ gcr
135+ accountsservice
136+ libsecret
137+ polkit
138+ gdk-pixbuf
139+ librsvg
140+ networkmanager
141+ libstartup_notification
142+ telepathy-glib
143+ gjs
144+ mutter
145+ libpulseaudio
146+ evolution-data-server
147+ libical
148+ gtk3
149+ gdm
150+ geoclue2
151+ adwaita-icon-theme
152+ gnome-bluetooth
153+ gnome-clocks # schemas needed
154+ at-spi2-core
155+ upower
156+ ibus
157+ gnome-desktop
158+ telepathy-logger
159+ gnome-settings-daemon
160+ gobject-introspection
161+
162+ # recording
163+ gst_all_1.gstreamer
164+ gst_all_1.gst-plugins-base
165+ gst_all_1.gst-plugins-good
166+
167+ # not declared at build time, but typelib is needed at runtime
168+ libgweather
169+ libnma
170+
171+ # for gnome-extension tool
172+ bash-completion
173+ gnome-autoar
174+ json-glib
175+ ];
176+
177+ mesonFlags = [
178+ "-Dgtk_doc=true"
179+ ];
180+
89181 postPatch = ''
90182 patchShebangs src/data-to-c.pl
91183 chmod +x meson/postinstall.py
pkgs/desktops/gnome-3/core/mutter/default.nix+13−21
@@ -7,14 +7,12 @@
77, gnome3
88, gettext
99, gobject-introspection
10−, upower
1110, cairo
1211, pango
13−, cogl
1412, json-glib
1513, libstartup_notification
1614, zenity
17−, libcanberra-gtk3
15+, libcanberra
1816, ninja
1917, xkeyboard_config
2018, libxkbfile
@@ -25,7 +23,6 @@
2523, glib
2624, gtk3
2725, gnome-desktop
28−, geocode-glib
2926, pipewire
3027, libgudev
3128, libwacom
@@ -54,6 +51,17 @@ let self = stdenv.mkDerivation rec {
5451 sha256 = "0p3jglw6f2h67kwk89qz1rz23y25lip8m2mp2xshf2vrg4a930as";
5552 };
5653
54+ patches = [
55+ # Drop inheritable cap_sys_nice, to prevent the ambient set from leaking
56+ # from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381
57+ ./drop-inheritable.patch
58+
59+ (substituteAll {
60+ src = ./fix-paths.patch;
61+ inherit zenity;
62+ })
63+ ];
64+
5765 mesonFlags = [
5866 "-Degl_device=true"
5967 "-Dinstalled_tests=false" # TODO: enable these
@@ -86,16 +94,14 @@ let self = stdenv.mkDerivation rec {
8694
8795 buildInputs = [
8896 cairo
89− cogl
9097 egl-wayland
91− geocode-glib
9298 glib
9399 gnome-desktop
94100 gnome-settings-daemon
95101 gobject-introspection
96102 gsettings-desktop-schemas
97103 gtk3
98− libcanberra-gtk3
104+ libcanberra
99105 libgudev
100106 libinput
101107 libstartup_notification
@@ -105,25 +111,11 @@ let self = stdenv.mkDerivation rec {
105111 pango
106112 pipewire
107113 sysprof
108− upower
109114 xkeyboard_config
110115 xwayland
111− zenity
112− zenity
113116 wayland-protocols
114117 ];
115118
116− patches = [
117− # Drop inheritable cap_sys_nice, to prevent the ambient set from leaking
118− # from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381
119− ./drop-inheritable.patch
120−
121− (substituteAll {
122− src = ./fix-paths.patch;
123− inherit zenity;
124− })
125− ];
126−
127119 postPatch = ''
128120 patchShebangs src/backends/native/gen-default-modes.py
129121 '';