From 0937ea6dabf6cb78bd616cb2f6e36dd6852085b2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 13 Jul 2020 09:42:02 +0200 Subject: [PATCH] gnome3.gnome-shell: Clean up MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove the following dependencies: * libcanberra – https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/327 * libsoup – https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/234 * libXtst – https://gitlab.gnome.org/GNOME/gnome-shell/commit/9f5a2d8aca5ae91be4cad12e6a3d02e1ac26e39a * glibcLocales – no longer necessary since glibc now contains C.UTF-8 locale * docbook-xsl-ns – not sure why this was included but there are no complaints when this is removed Also move gnome-autoar & json-glib to proper section and drop unused clutter arg. --- .../gnome-3/core/gnome-shell/default.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index ae062313cb9..c59c6e0375a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -10,22 +10,16 @@ , gettext , libsecret , python3 -, libsoup , polkit -, clutter , networkmanager , docbook-xsl-nons -, docbook-xsl-ns , at-spi2-core , libstartup_notification , telepathy-glib , telepathy-logger -, libXtst , unzip -, glibcLocales , shared-mime-info , libgweather -, libcanberra-gtk3 , librsvg , geoclue2 , perl @@ -114,11 +108,9 @@ stdenv.mkDerivation rec { pkg-config gettext docbook-xsl-nons - docbook-xsl-ns docbook_xml_dtd_42 perl wrapGAppsHook - glibcLocales sassc desktop-file-utils libxslt.bin @@ -132,17 +124,14 @@ stdenv.mkDerivation rec { gnome-keyring glib gcr - json-glib accountsservice libsecret - libsoup polkit gdk-pixbuf librsvg networkmanager libstartup_notification telepathy-glib - libXtst gjs mutter libpulseaudio @@ -150,7 +139,6 @@ stdenv.mkDerivation rec { libical gtk3 gdm - libcanberra-gtk3 geoclue2 adwaita-icon-theme gnome-bluetooth @@ -162,7 +150,6 @@ stdenv.mkDerivation rec { telepathy-logger gnome-settings-daemon gobject-introspection - gnome-autoar # recording gst_all_1.gstreamer @@ -175,10 +162,10 @@ stdenv.mkDerivation rec { # for gnome-extension tool bash-completion + gnome-autoar + json-glib ]; - LANG = "en_US.UTF-8"; - postPatch = '' patchShebangs src/data-to-c.pl chmod +x meson/postinstall.py