diff options
| author | Bobby Rong <rjl931189261@126.com> | 2023-06-04 18:31:10 +0800 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2023-06-14 15:47:57 +0800 |
| commit | 9447fa6d244de3cb35f917699e6c3bd86f328455 (patch) | |
| tree | e36ded37a412b97071e0c6cfcc2ba98a65c0e605 /pkgs/desktops/cinnamon/cinnamon-common | |
| parent | ac5791cffb3b475ac5111fd7b73da94d1c61e67c (diff) | |
| download | nixpkgs-9447fa6d244de3cb35f917699e6c3bd86f328455.tar nixpkgs-9447fa6d244de3cb35f917699e6c3bd86f328455.tar.gz nixpkgs-9447fa6d244de3cb35f917699e6c3bd86f328455.tar.bz2 nixpkgs-9447fa6d244de3cb35f917699e6c3bd86f328455.tar.lz nixpkgs-9447fa6d244de3cb35f917699e6c3bd86f328455.tar.xz nixpkgs-9447fa6d244de3cb35f917699e6c3bd86f328455.tar.zst nixpkgs-9447fa6d244de3cb35f917699e6c3bd86f328455.zip | |
cinnamon.cinnamon-common: 5.6.8 -> 5.8.2
https://github.com/linuxmint/cinnamon/compare/5.6.8...5.8.2
Diffstat (limited to 'pkgs/desktops/cinnamon/cinnamon-common')
| -rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-common/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-common/libdir.patch | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 0e33b9887ed..417cd6b717f 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -72,13 +72,13 @@ let in stdenv.mkDerivation rec { pname = "cinnamon-common"; - version = "5.6.8"; + version = "5.8.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - hash = "sha256-qL8GaEH/0d4yEwwdaR55fTp0RitbyptoxKOBO3nmbic="; + hash = "sha256-KY5ctByMYKxigiZ0X/blaHJuyiAUNB6B2gpGtC/k100="; }; patches = [ @@ -166,6 +166,7 @@ stdenv.mkDerivation rec { substituteInPlace ./bin/SettingsWidgets.py --replace "/usr/share/sounds" "/run/current-system/sw/share/sounds" substituteInPlace ./bin/Spices.py --replace "msgfmt" "${gettext}/bin/msgfmt" substituteInPlace ./modules/cs_info.py --replace "lspci" "${pciutils}/bin/lspci" + substituteInPlace ./modules/cs_themes.py --replace "$out/share/cinnamon/styles.d" "/run/current-system/sw/share/cinnamon/styles.d" popd sed "s| cinnamon-session| ${cinnamon-session}/bin/cinnamon-session|g" -i ./files/usr/bin/cinnamon-session-{cinnamon,cinnamon2d} diff --git a/pkgs/desktops/cinnamon/cinnamon-common/libdir.patch b/pkgs/desktops/cinnamon/cinnamon-common/libdir.patch index 7783d0b3ad1..bd15d658d81 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/libdir.patch +++ b/pkgs/desktops/cinnamon/cinnamon-common/libdir.patch @@ -17,6 +17,7 @@ index 3c1e9a4f..a77d9b3c 100644 schemadir = join_paths(datadir, 'glib-2.0', 'schemas') -pkglibdir = join_paths(libdir, meson.project_name().to_lower()) +pkglibdir = libdir + girdir = join_paths(datadir, 'gir-1.0') servicedir = join_paths(datadir, 'dbus-1', 'services') pkgdatadir = join_paths(datadir, meson.project_name().to_lower()) po_dir = join_paths(meson.source_root(), 'po') |