diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-07-18 14:48:23 +0800 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2022-08-03 20:46:27 +0800 |
| commit | 9da9a1474c44719c58b5f1a788d7888bb2d6d36e (patch) | |
| tree | d6870a37c4d970df27772e8fd0eb86f3f031b020 /pkgs/desktops/cinnamon | |
| parent | fbfbbc2d0c06f0334242aae6752bdeca317f16a6 (diff) | |
| download | nixpkgs-9da9a1474c44719c58b5f1a788d7888bb2d6d36e.tar nixpkgs-9da9a1474c44719c58b5f1a788d7888bb2d6d36e.tar.gz nixpkgs-9da9a1474c44719c58b5f1a788d7888bb2d6d36e.tar.bz2 nixpkgs-9da9a1474c44719c58b5f1a788d7888bb2d6d36e.tar.lz nixpkgs-9da9a1474c44719c58b5f1a788d7888bb2d6d36e.tar.xz nixpkgs-9da9a1474c44719c58b5f1a788d7888bb2d6d36e.tar.zst nixpkgs-9da9a1474c44719c58b5f1a788d7888bb2d6d36e.zip | |
cinnamon.cinnamon-common: 5.2.0 -> 5.4.8
Diffstat (limited to 'pkgs/desktops/cinnamon')
| -rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-common/default.nix | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 303443cc5f9..133f404ee9e 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -1,6 +1,5 @@ { atk , cacert -, fetchpatch , dbus , cinnamon-control-center , cinnamon-desktop @@ -8,11 +7,13 @@ , cinnamon-session , cinnamon-translations , cjs +, clutter , fetchFromGitHub , gdk-pixbuf , libgnomekbd , glib , gobject-introspection +, gsound , gtk3 , intltool , json-glib @@ -47,31 +48,26 @@ , meson , ninja , gst_all_1 +, perl }: stdenv.mkDerivation rec { pname = "cinnamon-common"; - version = "5.2.0"; + version = "5.4.8"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - hash = "sha256-B2Du2zis0xWeeyh3kSyz1doWImk9Fuk4qQ8HNZZdqdw="; + hash = "sha256-Z+BbvLgH4gOsLMSC0r5Hp9yDZz4XMH7NR/A9to+/djA="; }; patches = [ ./use-sane-install-dir.patch ./libdir.patch - - (fetchpatch { - url = "https://github.com/linuxmint/cinnamon/commit/77ed66050f7df889fcb7a10b702c7b8bcdeaa130.patch"; - sha256 = "sha256-OegLxz6Xr/nxVwVOAd2oOY62ohZ3r6uYn1+YED5EBHQ="; - }) ]; buildInputs = [ - # TODO: review if we really need this all (python3.withPackages (pp: with pp; [ dbus-python setproctitle pygobject3 pycairo xapp pillow pytz tinycss2 python-pam pexpect distro requests ])) atk cacert @@ -79,9 +75,11 @@ stdenv.mkDerivation rec { cinnamon-desktop cinnamon-menus cjs + clutter dbus gdk-pixbuf glib + gsound gtk3 json-glib libsoup @@ -120,6 +118,7 @@ stdenv.mkDerivation rec { wrapGAppsHook intltool gtk-doc + perl ]; # use locales from cinnamon-translations (not using --localedir because datadir is used) @@ -151,6 +150,8 @@ stdenv.mkDerivation rec { sed "s| cinnamon-session| ${cinnamon-session}/bin/cinnamon-session|g" -i ./files/usr/bin/cinnamon-session-cinnamon -i ./files/usr/bin/cinnamon-session-cinnamon2d sed "s|/usr/bin|$out/bin|g" -i ./files/usr/share/xsessions/cinnamon.desktop ./files/usr/share/xsessions/cinnamon2d.desktop + + patchShebangs src/data-to-c.pl ''; passthru = { |