diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-09-21 15:03:20 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-21 15:03:20 +0800 |
| commit | a309b9794d0aa2356080f31f00cf2d466c1599c5 (patch) | |
| tree | 383d517a84d8741d7c52036e04a3eddc1b40bbf9 /pkgs/desktops | |
| parent | 4383c38aa83cfecf512cd7aa28d232405f80bf67 (diff) | |
| parent | 54d0a168b381ec413a1a4d1f4ca3411f9fe72b7e (diff) | |
Merge pull request #191811 from bobby285271/cjs
cinnamon.cjs: various clean up
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/cinnamon/cjs/default.nix | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix index 74b1053818362..63be8c0d569bf 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 = [ |