diff options
| author | Bobby Rong <rjl931189261@126.com> | 2024-06-25 21:41:34 +0800 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2024-06-29 22:48:43 +0800 |
| commit | 1b81e424bc93783eccea5c1763de2225f53b7b7c (patch) | |
| tree | b61d8a7f303eac1f2e93b106f67c9de4ff9152cc /pkgs/desktops/cinnamon | |
| parent | af598c89a2d7dd9eb4eb50ce1241a35b14ead05c (diff) | |
cinnamon.cjs: 6.0.0 -> 6.2.0
https://github.com/linuxmint/cjs/compare/6.0.0...6.2.0
Diffstat (limited to 'pkgs/desktops/cinnamon')
| -rw-r--r-- | pkgs/desktops/cinnamon/cjs/default.nix | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix index 4ff139ba787e8..bb7ab672dbf0d 100644 --- a/pkgs/desktops/cinnamon/cjs/default.nix +++ b/pkgs/desktops/cinnamon/cjs/default.nix @@ -6,8 +6,10 @@ , cairo , glib , readline -, spidermonkey_102 +, libsysprof-capture +, spidermonkey_115 , meson +, mesonEmulatorHook , dbus , ninja , which @@ -16,13 +18,13 @@ stdenv.mkDerivation rec { pname = "cjs"; - version = "6.0.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cjs"; rev = version; - hash = "sha256-oSqEAZWEVb8NxFTScl8s5Mb04tCGDyVVslYW00s4YYk="; + hash = "sha256-/74E10txRjwN9RkjVB8M0MPYakJ659yJWanc4DC09wg="; }; outputs = [ "out" "dev" ]; @@ -33,21 +35,24 @@ stdenv.mkDerivation rec { pkg-config which # for locale detection libxml2 # for xml-stripblanks + dbus # for dbus-run-session gobject-introspection + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ cairo readline - spidermonkey_102 - dbus # for dbus-run-session + libsysprof-capture + spidermonkey_115 ]; propagatedBuildInputs = [ glib ]; - mesonFlags = [ + mesonFlags = lib.optionals stdenv.hostPlatform.isMusl [ "-Dprofiler=disabled" ]; |