From 9c33a3ff21571fe83c07eb20bada89da0b3b5acc Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 18 Oct 2020 01:03:02 +0200 Subject: [PATCH] gnomeExtensions.gsconnect: Clean up * Caribou dependency was removed in v27 (https://github.com/andyholmes/gnome-shell-extension-gsconnect/commit/fd1a771ef4c5d96c55a6919f491d394bfd8ea2e5) * Atspi is optional since then, when Mutter is built with Pipewire support. * Nautilus stuff does not actually seem to be used directly, the Python script will be eventually loaded by nautilus-python. * UPower is used through D-Bus now (https://github.com/andyholmes/gnome-shell-extension-gsconnect/commit/c53491f97d95b7799482e9148b289842a8242769) * xmllint does not seem to be used (maybe it was used for building GResource in the past) * use pkg-config instead of alias --- .../gnome-3/extensions/gsconnect/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix index e2159e2e3865..5e51b995a54b 100644 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix @@ -1,19 +1,15 @@ { stdenv , fetchFromGitHub , substituteAll -, python3 , openssl , gsound , meson , ninja -, libxml2 -, pkgconfig +, pkg-config , gobject-introspection , wrapGAppsHook , glib , gtk3 -, at-spi2-core -, upower , openssh , gnome3 , gjs @@ -50,21 +46,17 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - meson ninja pkgconfig + meson + ninja + pkg-config gobject-introspection # for locating typelibs wrapGAppsHook # for wrapping daemons - libxml2 # xmllint ]; buildInputs = [ glib # libgobject gtk3 - at-spi2-core # atspi - gnome3.nautilus # TODO: this contaminates the package with nautilus and gnome-autoar typelibs but it is only needed for the extension - gnome3.nautilus-python gsound - upower - gnome3.caribou gjs # for running daemon gnome3.evolution-data-server # for libebook-contacts typelib ];