3
0
Fork 0
forked from mirrors/nixpkgs

gnome3.gnome-shell: 3.36.5 -> 3.38.0

https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/3.38.0/NEWS

- Screencasting service has been factored out:
  https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1372
This commit is contained in:
Piotr Bogdan 2020-09-18 15:34:06 +01:00 committed by Jan Tojnar
parent 719892a69a
commit a17b2aa43d
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
2 changed files with 15 additions and 13 deletions

View file

@ -51,6 +51,7 @@
, gtk3
, sassc
, systemd
, pipewire
, gst_all_1
, adwaita-icon-theme
, gnome-bluetooth
@ -67,13 +68,13 @@ let
in
stdenv.mkDerivation rec {
pname = "gnome-shell";
version = "3.36.5";
version = "3.38.0";
outputs = [ "out" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1hj7gmjmy92xndlgw7pzk5m6j2fbzcgfd1pxc32k38gml8qg19d4";
url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "15qabakial0jcsqkq1xg4fsssarixq6aqqksikdfcpl7q0xl09n6";
};
patches = [
@ -84,13 +85,6 @@ stdenv.mkDerivation rec {
gsettings = "${glib.bin}/bin/gsettings";
})
# Install bash-completions to correct prefix.
# https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1194
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/9f1ad5d86ddbabaa840eb2860279d53f4e635453.patch";
sha256 = "18amnqw342vllcrjpfcq232z9xr28vgjsf2z8k73xx70nwah7hvz";
})
# Use absolute path for libshew installation to make our patched gobject-introspection
# aware of the location to hardcode in the generated GIR file.
./shew-gir-path.patch
@ -105,6 +99,13 @@ stdenv.mkDerivation rec {
revert = true;
sha256 = "14h7ahlxgly0n3sskzq9dhxzbyb04fn80pv74vz1526396676dzl";
})
# Remove include of missing file preventing docs from building.
# https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1448
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/84cff8920509f99be47c017bd8bdf8e45ea90535.patch";
sha256 = "9bFfT7bHMdxPjDUvjoIrFQ3eddQv/kXyeTOAM+7eUm8=";
})
];
nativeBuildInputs = [
@ -160,6 +161,7 @@ stdenv.mkDerivation rec {
gobject-introspection
# recording
pipewire
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
@ -197,7 +199,7 @@ stdenv.mkDerivation rec {
postFixup = ''
# The services need typelibs.
for svc in org.gnome.Shell.Extensions org.gnome.Shell.Notifications; do
for svc in org.gnome.Shell.Extensions org.gnome.Shell.Notifications org.gnome.Shell.Screencast; do
wrapGApp $out/share/gnome-shell/$svc
done
'';

View file

@ -19,8 +19,8 @@
+ Util.spawn(['@libgnomekbd@/bin/gkbd-keyboard-display', '-l', description]);
}
});
--- a/data/gnome-shell-disable-extensions.service
+++ b/data/gnome-shell-disable-extensions.service
--- a/data/org.gnome.Shell-disable-extensions.service
+++ b/data/org.gnome.Shell-disable-extensions.service
@@ -10,5 +10,5 @@ Requisite=gnome-session-stable.timer
[Service]
Type=simple