diff options
author | Katharina Fey <kookie@spacekookie.de> | 2020-04-19 14:57:25 +0200 |
---|---|---|
committer | Katharina Fey <kookie@spacekookie.de> | 2020-04-19 14:57:25 +0200 |
commit | 0ca211d4ec600fa7b3cc701e4997cd1e8d38ebdc (patch) | |
tree | 4f9b09ca5d55e44710f020bcf6621daa4fd6b73a /nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix | |
parent | 1c2ef52230ed2c8b2529c47ce6a857bdde46c7c7 (diff) | |
parent | b61999e4ad60c351b4da63ae3ff43aae3c0bbdfb (diff) |
Merge commit 'b61999e4ad60c351b4da63ae3ff43aae3c0bbdfb'
Diffstat (limited to 'nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix')
-rw-r--r-- | nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 71 |
1 files changed, 50 insertions, 21 deletions
diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 71d47a338a7..bcb72cb95b6 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -1,12 +1,14 @@ -{ fetchurl, fetchpatch, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, json-glib, libcroco, gettext, libsecret +{ fetchurl, fetchpatch, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, json-glib, gettext, libsecret , python3, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core , libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info , libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils -, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr -, accountsservice, gdk-pixbuf, gdm, upower, ibus, networkmanagerapplet, libgnomekbd, gnome-desktop +, libpulseaudio, libical, gobject-introspection, wrapGAppsHook, libxslt, gcr +, accountsservice, gdk-pixbuf, gdm, upower, ibus, libnma, libgnomekbd, gnome-desktop , gsettings-desktop-schemas, gnome-keyring, glib, gjs, mutter, evolution-data-server, gtk3 , sassc, systemd, gst_all_1, adwaita-icon-theme, gnome-bluetooth, gnome-clocks, gnome-settings-daemon -, gnome-autoar, asciidoc-full }: +, gnome-autoar, asciidoc-full +, bash-completion +}: # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup @@ -15,11 +17,11 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "3.34.4"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0rm32h7lv4vyadi9x32sb6fwxslarwk70yzmvzjxbq872cazp779"; + sha256 = "0696qw6bmbga30qlvh1k6bkiajl7877j8yis4bwmi1wxkcmkh854"; }; LANG = "en_US.UTF-8"; @@ -31,45 +33,65 @@ in stdenv.mkDerivation rec { buildInputs = [ systemd gsettings-desktop-schemas gnome-keyring glib gcr json-glib accountsservice - libcroco libsecret libsoup polkit gdk-pixbuf librsvg - clutter networkmanager libstartup_notification telepathy-glib + libsecret libsoup polkit gdk-pixbuf librsvg + networkmanager libstartup_notification telepathy-glib libXtst gjs mutter libpulseaudio evolution-data-server - libical gtk3 gstreamer gdm libcanberra-gtk3 geoclue2 + libical gtk3 gdm libcanberra-gtk3 geoclue2 adwaita-icon-theme gnome-bluetooth gnome-clocks # schemas needed at-spi2-core upower ibus gnome-desktop telepathy-logger gnome-settings-daemon - gst_all_1.gst-plugins-good # recording gobject-introspection gnome-autoar + # recording + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + # not declared at build time, but typelib is needed at runtime - libgweather networkmanagerapplet + libgweather libnma + + # for gnome-extension tool + bash-completion ]; patches = [ - (fetchpatch { - name = "0001-build-Add-missing-dependency-to-run-js-test.patch"; - url = https://bug787864.bugzilla-attachments.gnome.org/attachment.cgi?id=360016; - sha256 = "1dmahd8ysbzh33rxglba0fbq127aw9h14cl2a2bw9913vjxhxijm"; - }) + # Hardcode paths to various dependencies so that they can be found at runtime. (substituteAll { src = ./fix-paths.patch; inherit libgnomekbd unzip; gsettings = "${glib.bin}/bin/gsettings"; }) + + # Install bash-completions to correct prefix. + # https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1194 + ./fix-bash-completion.patch + + # 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 + + # Make D-Bus services wrappable. + ./wrap-services.patch + + # Fix greeter logo being too big. + # https://gitlab.gnome.org/GNOME/gnome-shell/issues/2591 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/ffb8bd5fa7704ce70ce7d053e03549dd15dce5ae.patch"; + revert = true; + sha256 = "9DdzjEnDiBL+JmdfgKwjYPn1O2wJ/6n1sMDT1ylUB5I="; + }) ]; postPatch = '' patchShebangs src/data-to-c.pl + chmod +x meson/postinstall.py + patchShebangs meson/postinstall.py substituteInPlace src/gnome-shell-extension-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python" substituteInPlace src/gnome-shell-perf-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python" ''; - postInstall = '' - glib-compile-schemas $out/share/glib-2.0/schemas - ''; - preFixup = '' gappsWrapperArgs+=( # Until glib’s xdgmime is patched @@ -78,6 +100,13 @@ in stdenv.mkDerivation rec { ) ''; + postFixup = '' + # The services need typelibs. + for svc in org.gnome.Shell.Extensions org.gnome.Shell.Notifications; do + wrapGApp $out/share/gnome-shell/$svc + done + ''; + passthru = { mozillaPlugin = "/lib/mozilla/plugins"; updateScript = gnome3.updateScript { @@ -88,7 +117,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Core user interface for the GNOME 3 desktop"; - homepage = https://wiki.gnome.org/Projects/GnomeShell; + homepage = "https://wiki.gnome.org/Projects/GnomeShell"; license = licenses.gpl2Plus; maintainers = gnome3.maintainers; platforms = platforms.linux; |