Gnome shell 3.36.1 #84792

hedning · 2020-04-09T09:23:47Z

Motivation for this change

Bump gnome-shell. This unfortunately breaks the extension app, as they've introduced a new internal library (libshew) which gets an incorrect path in its typelib ala. eog.

Not sure if we've found a good way to deal with these failures (I seem to recall we've fixed something like this before, but can't quite remember).

Things done

jtojnar · 2020-04-09T09:49:04Z

pkgs/desktops/gnome-3/core/gnome-shell/default.nix

-      url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/766288eec1bd3bd50dfc4ddf410c2b507187e603.patch";
-      sha256 = "Cp6xLohCM0gmMxtyYjSukS2oV60Khmxf4iQd9EDAlIc=";
-    })
+    ./fix-bash-completion.patch


Do you have link to an upstream MR?

I did it here https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1195

jtojnar · 2020-04-09T09:56:27Z

Our gobject-introspection patches require that the install_dir for the library in meson is absolute. So replace it with get_option('prefix') / pkglibdir.

worldofpeace · 2020-04-09T18:46:42Z

Upstream patch for the define variable thing https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1195

pkgs/desktops/gnome-3/core/gnome-shell/default.nix

worldofpeace · 2020-04-09T20:16:47Z

We have a request to add another patch #84805.
This one in mutter https://gitlab.gnome.org/GNOME/mutter/-/commit/23d0bdd46d849379ed4c0146fbc1784f5f32f2f8.

jtojnar · 2020-04-09T20:33:28Z

That commit does not look like anything but cleanup.

worldofpeace · 2020-04-09T20:34:44Z

Oops, I think I grabbed the wrong commit. See https://gitlab.gnome.org/GNOME/mutter/-/issues/1128

jtojnar · 2020-04-09T20:44:36Z

That should already be included: https://gitlab.gnome.org/GNOME/mutter/-/commit/92710d8f895188ffee99a50079c96f2a2354eebd

hedning · 2020-04-10T08:02:13Z

Ok, two remaining issues. Looks like the extension app is now activated through dbus or something, so the wrapper is no longer effective. Adding gtk to the search path fixed the issue.

Also forgot about this, but the size of the nixos-graphics in gdm is now wrong for some reason:

jtojnar · 2020-04-10T08:05:44Z

I am running this now and did not notice anything other than:

Reverting gnome-hell update fixes it.

hedning · 2020-04-10T08:07:04Z

Yeah, looks like this is the problem with the vendor logo: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/2591, they use the «natural» scale of the image, which in our case is rather large.

hedning · 2020-04-10T09:40:28Z

Hmm, right, I'm not actually able launch the extension app, getting this error:

april 10 11:37:07 x230 gjs[6098]: JS ERROR: Error: Requiring Gtk, version 3.0: Typelib file for namespace 'Gtk', version '3.0' not found
                                  @resource:///org/gnome/Shell/Extensions/js/main.js:6:17
                                  start@resource:///org/gnome/gjs/modules/script/package.js:206:5
                                  @/nix/store/v4cqz1r08gfvhfyrxq957di3f7iiqfwp-gnome-shell-3.36.1/share/gnome-shell/org.gnome.Shell.Extensions:1:17

I tested things in a nested wayland shell, and that happened to fix the issue (probably seeded the environment with the correct typelib paths).

@jtojnar you're able to launch the extension app?

jtojnar · 2020-04-10T10:07:09Z

I was seeing

(gnome-shell-extension-prefs:27699): Gjs-WARNING **: 10:15:31.722: JS ERROR: Gio.DBusError: Error calling StartServiceByName for org.gnome.Shell.Extensions: Process org.gnome.Shell.Extensions exited with status 1
_injectToMethod/klass[method]@resource:///org/gnome/gjs/modules/core/overrides/Gio.js:290:25
_makeProxyWrapper/<@resource:///org/gnome/gjs/modules/core/overrides/Gio.js:267:17
vfunc_startup@resource:///org/gnome/Extensions/js/main.js:69:28
main@resource:///org/gnome/Extensions/js/main.js:499:23
run@resource:///org/gnome/gjs/modules/script/package.js:222:19
start@resource:///org/gnome/gjs/modules/script/package.js:206:5
@/nix/store/s5yirnjfa4mncn9ds4a4iplraj7nyxvl-gnome-shell-3.36.1/share/gnome-shell/org.gnome.Extensions:1:17

Gjs-Message: 10:15:31.722: JS WARNING: [resource:///org/gnome/Extensions/js/main.js 51]: reference to undefined property "_shellProxy"

(gnome-shell-extension-prefs:27699): Gjs-WARNING **: 10:15:31.722: JS ERROR: TypeError: this._shellProxy is undefined
vfunc_activate@resource:///org/gnome/Extensions/js/main.js:51:9
main@resource:///org/gnome/Extensions/js/main.js:499:23
run@resource:///org/gnome/gjs/modules/script/package.js:222:19
start@resource:///org/gnome/gjs/modules/script/package.js:206:5
@/nix/store/s5yirnjfa4mncn9ds4a4iplraj7nyxvl-gnome-shell-3.36.1/share/gnome-shell/org.gnome.Extensions:1:17

how did you deduce the missing typelib from that?

Weirdly $out/share/dbus-1/services/org.gnome.Extensions.service goes through bin/ which is wrapped. Edit: Oh, there is also $out/share/dbus-1/services/org.gnome.Shell.Extensions.service (?!), we probably need to give it gnome-characters treatment.

GTK would not be enough since it depends on pango and other typelibs.

hedning · 2020-04-10T10:13:27Z

The tyeblib error pops up in the journal. It's indeed a bit weird that the wrapper doesn't work, since the service is launched through it as you note. But I guess there's a layer of indirection there somewhere, which causes the problem and results in the error being in the journal and not stderr.

jtojnar · 2020-04-10T18:05:03Z

Okay, so org.gnome.Shell.Extensions is a portal-like service in $out/share/gnome-shell/org.gnome.Shell.Extensions (https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/master/js/dbusServices/extensions/main.js) and org.gnome.Extensions is the app. The error was coming from the service but you were inserting the typelibs to the app, which failed because it depends on the service.

jtojnar · 2020-04-10T19:50:36Z

I wondered how does the org.gnome.Shell.Notifications work when it depends on GLib typelibs and it looks like gjs supports it even when it is not in GI_TYPELIB_PATH:

$ nix run --ignore-environment -f . gjs -c gjs -c 'print(imports.gi.GLib)'
[object GIRepositoryNamespace]

jtojnar · 2020-04-11T10:41:08Z

Reverted the greeter logo patch and fixed the wrapping of the notification services but it is pretty ugly.

- Adds bash-completion depedency. - New internal library (`libshew`) require absolute install path. - Some services (like the extension app) isn't wrapped correctly without patching. Co-authored-by: Jan Tojnar <jtojnar@gmail.com>

hedning · 2020-04-12T12:50:17Z

Looks good to me now, thanks for taking this on :)

ofborg bot added the 6.topic: GNOME GNOME desktop environment and its underlying platform label Apr 9, 2020

ofborg bot requested review from worldofpeace and jtojnar April 9, 2020 09:31

ofborg bot added 11.by: package-maintainer 10.rebuild-darwin: 0 10.rebuild-linux: 11-100 labels Apr 9, 2020

jtojnar reviewed Apr 9, 2020

View reviewed changes

ofborg bot added the 8.has: documentation label Apr 9, 2020

worldofpeace reviewed Apr 9, 2020

View reviewed changes

pkgs/desktops/gnome-3/core/gnome-shell/default.nix Show resolved Hide resolved

ofborg bot requested review from emanueleperuffo, jtojnar and worldofpeace April 9, 2020 20:23

worldofpeace mentioned this pull request Apr 9, 2020

Gnome 3.36 multiple monitor DPI scaling disables displays with Nvidia driver #84805

Closed

jtojnar self-assigned this Apr 10, 2020

ofborg bot added the 2.status: merge conflict label Apr 11, 2020

jtojnar marked this pull request as ready for review April 11, 2020 10:33

jtojnar force-pushed the gnome-shell-3.36.1 branch from 79956d5 to 40197cd Compare April 11, 2020 10:39

jtojnar removed their assignment Apr 11, 2020

hedning and others added 4 commits April 12, 2020 13:37

gnome3.gnome-shell: 3.36.0 -> 3.36.1

b5fd24e

- Adds bash-completion depedency. - New internal library (`libshew`) require absolute install path. - Some services (like the extension app) isn't wrapped correctly without patching. Co-authored-by: Jan Tojnar <jtojnar@gmail.com>

gnome3.mutter: 3.36.0 → 3.36.1

8371297

gnome3.gnome-shell-extensions: 3.36.0 -> 3.36.1

53f5488

gnomeExtensions.dash-to-dock: update to rebased tip

aac691a

hedning force-pushed the gnome-shell-3.36.1 branch from 40197cd to aac691a Compare April 12, 2020 12:48

jtojnar approved these changes Apr 12, 2020

View reviewed changes

hedning merged commit 4cfe8fb into NixOS:master Apr 12, 2020

hedning deleted the gnome-shell-3.36.1 branch April 12, 2020 16:04

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Gnome shell 3.36.1 #84792

Gnome shell 3.36.1 #84792

hedning commented Apr 9, 2020

jtojnar Apr 9, 2020

worldofpeace Apr 9, 2020

jtojnar commented Apr 9, 2020

worldofpeace commented Apr 9, 2020

worldofpeace commented Apr 9, 2020

jtojnar commented Apr 9, 2020

worldofpeace commented Apr 9, 2020

jtojnar commented Apr 9, 2020

hedning commented Apr 10, 2020

jtojnar commented Apr 10, 2020

hedning commented Apr 10, 2020

hedning commented Apr 10, 2020

jtojnar commented Apr 10, 2020 •

edited

hedning commented Apr 10, 2020

jtojnar commented Apr 10, 2020

jtojnar commented Apr 10, 2020

jtojnar commented Apr 11, 2020

hedning commented Apr 12, 2020

Gnome shell 3.36.1 #84792

Gnome shell 3.36.1 #84792

Conversation

hedning commented Apr 9, 2020

Motivation for this change

Things done

jtojnar Apr 9, 2020

Choose a reason for hiding this comment

worldofpeace Apr 9, 2020

Choose a reason for hiding this comment

jtojnar commented Apr 9, 2020

worldofpeace commented Apr 9, 2020

worldofpeace commented Apr 9, 2020

jtojnar commented Apr 9, 2020

worldofpeace commented Apr 9, 2020

jtojnar commented Apr 9, 2020

hedning commented Apr 10, 2020

jtojnar commented Apr 10, 2020

hedning commented Apr 10, 2020

hedning commented Apr 10, 2020

jtojnar commented Apr 10, 2020 • edited

hedning commented Apr 10, 2020

jtojnar commented Apr 10, 2020

jtojnar commented Apr 10, 2020

jtojnar commented Apr 11, 2020

hedning commented Apr 12, 2020

jtojnar commented Apr 10, 2020 •

edited