From 54d0a168b381ec413a1a4d1f4ca3411f9fe72b7e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 18 Sep 2022 23:06:11 +0800 Subject: [PATCH] cinnamon.cjs: various clean up - Remove unused args - Remove makeWrapper since it is not used - Remove checkInputs since we don't run tests - Clean up propagated bindings since grepping them returns nothing - Don't pull in gtk4 since it is only used in an optional test --- pkgs/desktops/cinnamon/cjs/default.nix | 30 ++------------------------ 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix index 74b105381836..63be8c0d569b 100644 --- a/pkgs/desktops/cinnamon/cjs/default.nix +++ b/pkgs/desktops/cinnamon/cjs/default.nix @@ -1,31 +1,17 @@ -{ dbus-glib +{ stdenv +, lib , fetchFromGitHub , gobject-introspection , pkg-config -, lib -, stdenv -, wrapGAppsHook -, python3 , cairo -, gnome -, xapp -, keybinder3 -, upower -, callPackage , glib -, libffi -, gtk3 , readline , spidermonkey_78 , meson -, sysprof , dbus -, xvfb-run , ninja -, makeWrapper , which , libxml2 -, gtk4 }: stdenv.mkDerivation rec { @@ -45,13 +31,11 @@ stdenv.mkDerivation rec { meson ninja pkg-config - makeWrapper which # for locale detection libxml2 # for xml-stripblanks ]; buildInputs = [ - gtk4 gobject-introspection cairo readline @@ -59,18 +43,8 @@ stdenv.mkDerivation rec { dbus # for dbus-run-session ]; - checkInputs = [ - xvfb-run - ]; - propagatedBuildInputs = [ glib - - # bindings - gnome.caribou - keybinder3 - upower - xapp ]; mesonFlags = [