diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 24 | ||||
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch | 4 |
2 files changed, 9 insertions, 19 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 8f2e78c639c2..3ebf409f0308 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -16,15 +16,12 @@ , docbook-xsl-nons , at-spi2-core , libstartup_notification -, telepathy-glib -, telepathy-logger , unzip , shared-mime-info , libgweather , librsvg , geoclue2 , perl -, docbook_xml_dtd_412 , docbook_xml_dtd_42 , docbook_xml_dtd_43 , desktop-file-utils @@ -51,6 +48,7 @@ , gtk3 , sassc , systemd +, pipewire , gst_all_1 , adwaita-icon-theme , gnome-bluetooth @@ -67,13 +65,13 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "3.36.5"; + version = "3.38.1"; 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 = "1d0br74gxwnqbh102yjkszkc6fc4yd6p5lcs6bxcpi33chly72dp"; }; patches = [ @@ -84,13 +82,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 @@ -113,7 +104,7 @@ stdenv.mkDerivation rec { pkg-config gettext docbook-xsl-nons - docbook_xml_dtd_412 + # Switch to 4.5 in the 40. docbook_xml_dtd_42 docbook_xml_dtd_43 gtk-doc @@ -139,7 +130,6 @@ stdenv.mkDerivation rec { librsvg networkmanager libstartup_notification - telepathy-glib gjs mutter libpulseaudio @@ -155,11 +145,11 @@ stdenv.mkDerivation rec { upower ibus gnome-desktop - telepathy-logger gnome-settings-daemon gobject-introspection # recording + pipewire gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good @@ -197,7 +187,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 ''; diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch index 7b93475619b2..e17a608a2d85 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch @@ -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 |