nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-21 19:44:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

cinnamon.cinnamon-common: 5.2.0 -> 5.4.8

Browse Source
This commit is contained in:
Bobby Rong 2022-07-18 14:48:23 +08:00
parent fbfbbc2d0c
commit 9da9a1474c
No known key found for this signature in database
GPG Key ID: ED07364437C91161
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/desktops/cinnamon/cinnamon-common/default.nix
View File

@ -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 = {