mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 12:29:02 +02:00
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).612e04165e
Dark and light theme variants have their own css files:d76f309dba
Dropped soup 2 support. Changelog-reviewed-by: Bobby Rong <rjl931189261@126.com> Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
This commit is contained in:
parent
e3e0c34673
commit
842b294c39
|
@ -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 = ''
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue