Merge pull request #191811 from bobby285271/cjs
cinnamon.cjs: various clean up
This commit is contained in:
commit
a309b9794d
1 changed files with 2 additions and 28 deletions
|
@ -1,31 +1,17 @@
|
||||||
{ dbus-glib
|
{ stdenv
|
||||||
|
, lib
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, lib
|
|
||||||
, stdenv
|
|
||||||
, wrapGAppsHook
|
|
||||||
, python3
|
|
||||||
, cairo
|
, cairo
|
||||||
, gnome
|
|
||||||
, xapp
|
|
||||||
, keybinder3
|
|
||||||
, upower
|
|
||||||
, callPackage
|
|
||||||
, glib
|
, glib
|
||||||
, libffi
|
|
||||||
, gtk3
|
|
||||||
, readline
|
, readline
|
||||||
, spidermonkey_78
|
, spidermonkey_78
|
||||||
, meson
|
, meson
|
||||||
, sysprof
|
|
||||||
, dbus
|
, dbus
|
||||||
, xvfb-run
|
|
||||||
, ninja
|
, ninja
|
||||||
, makeWrapper
|
|
||||||
, which
|
, which
|
||||||
, libxml2
|
, libxml2
|
||||||
, gtk4
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -45,13 +31,11 @@ stdenv.mkDerivation rec {
|
||||||
meson
|
meson
|
||||||
ninja
|
ninja
|
||||||
pkg-config
|
pkg-config
|
||||||
makeWrapper
|
|
||||||
which # for locale detection
|
which # for locale detection
|
||||||
libxml2 # for xml-stripblanks
|
libxml2 # for xml-stripblanks
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
gtk4
|
|
||||||
gobject-introspection
|
gobject-introspection
|
||||||
cairo
|
cairo
|
||||||
readline
|
readline
|
||||||
|
@ -59,18 +43,8 @@ stdenv.mkDerivation rec {
|
||||||
dbus # for dbus-run-session
|
dbus # for dbus-run-session
|
||||||
];
|
];
|
||||||
|
|
||||||
checkInputs = [
|
|
||||||
xvfb-run
|
|
||||||
];
|
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
glib
|
glib
|
||||||
|
|
||||||
# bindings
|
|
||||||
gnome.caribou
|
|
||||||
keybinder3
|
|
||||||
upower
|
|
||||||
xapp
|
|
||||||
];
|
];
|
||||||
|
|
||||||
mesonFlags = [
|
mesonFlags = [
|
||||||
|
|
Loading…
Reference in a new issue