diff options
| author | Bobby Rong <rjl931189261@126.com> | 2023-09-24 12:10:49 +0800 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2023-11-21 08:41:33 +0100 |
| commit | 842b294c390c71d2a589d6b74c891d1015f0ad21 (patch) | |
| tree | f1b3b43d7ee1e028d86b42777b1cd2d032f96c0d /pkgs/desktops/gnome/core/gnome-shell | |
| parent | e3e0c34673bce2d8ba8ddc552cf7221661e75ac9 (diff) | |
gnome.gnome-shell: 44.5 → 45.alpha
https://gitlab.gnome.org/GNOME/gnome-shell/-/compare/44.5...45.alpha Still need gdk-x11-3.0. dbusServices are ported to ESM (gjs -m). I assume our js/dbusServices/dbus-service.in patch should still work after a trivial rebase, by test starting gnome-extensions-app (it will fail to start with Gio.DBusError: Error calling StartServiceByName for org.gnome.Shell.Extensions without this patch). https://github.com/GNOME/gnome-shell/commit/612e04165e2769134ef0958be8d42e6fb8c38f20 Dark and light theme variants have their own css files: https://github.com/GNOME/gnome-shell/commit/d76f309dba597c760d92fda7338a6904dafaf0e5 Dropped soup 2 support. Changelog-reviewed-by: Bobby Rong <rjl931189261@126.com> Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
Diffstat (limited to 'pkgs/desktops/gnome/core/gnome-shell')
| -rw-r--r-- | pkgs/desktops/gnome/core/gnome-shell/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/desktops/gnome/core/gnome-shell/wrap-services.patch | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index 176cb4271b8d6..58f4621e8d6a9 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -28,7 +28,7 @@ , libpulseaudio , libical , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook4 , libxslt , gcr_4 , accountsservice @@ -67,13 +67,13 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "44.5"; + version = "45.alpha"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "wWr84Dgd1ZNCfXCER6nR+sdInrApRe+zfpBMp0qSSjU="; + sha256 = "fBXgRyi3oykhH/SJODTbPJlX8PIGHkAoyFCYYR6x97I="; }; patches = [ @@ -117,7 +117,7 @@ stdenv.mkDerivation rec { docbook_xml_dtd_45 gtk-doc perl - wrapGAppsHook + wrapGAppsHook4 sassc desktop-file-utils libxslt.bin @@ -187,7 +187,7 @@ stdenv.mkDerivation rec { # We can generate it ourselves. rm -f man/gnome-shell.1 - rm data/theme/gnome-shell.css + rm data/theme/gnome-shell-{light,dark}.css ''; postInstall = '' diff --git a/pkgs/desktops/gnome/core/gnome-shell/wrap-services.patch b/pkgs/desktops/gnome/core/gnome-shell/wrap-services.patch index 5ce4a2fd46d7f..eca485c321244 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/wrap-services.patch +++ b/pkgs/desktops/gnome/core/gnome-shell/wrap-services.patch @@ -1,19 +1,19 @@ diff --git a/js/dbusServices/dbus-service.in b/js/dbusServices/dbus-service.in old mode 100644 new mode 100755 -index 524166102..6d0722a1c +index 5c698f58a..1ed61a7e3 --- a/js/dbusServices/dbus-service.in +++ b/js/dbusServices/dbus-service.in @@ -1,3 +1,9 @@ -+#!@gjs@ ++#!@gjs@ -m + +// gjs determines the package name from argv[0], which is .*-wrapped +// so we need to override it to the original one. +imports.package._findEffectiveEntryPointName = () => '@service@' + - imports.package.start({ - name: '@PACKAGE_NAME@', - prefix: '@prefix@', + import {programInvocationName, programArgs} from 'system'; + + imports.package.init({ diff --git a/js/dbusServices/dbus-service.service.in b/js/dbusServices/dbus-service.service.in index 3b0d09abe..4fd4bb66d 100644 --- a/js/dbusServices/dbus-service.service.in @@ -21,7 +21,7 @@ index 3b0d09abe..4fd4bb66d 100644 @@ -1,3 +1,3 @@ [D-BUS Service] Name=@service@ --Exec=@gjs@ @pkgdatadir@/@service@ +-Exec=@gjs@ -m @pkgdatadir@/@service@ +Exec=@pkgdatadir@/@service@ diff --git a/js/dbusServices/meson.build b/js/dbusServices/meson.build index eb941ed90..552051e5a 100644 |