cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

cinnamon.cinnamon-common: 5.6.8 -> 5.8.2

Browse source 
https://github.com/linuxmint/cinnamon/compare/5.6.8...5.8.2
This commit is contained in:
Bobby Rong 2023-06-04 18:31:10 +08:00
parent ac5791cffb
commit 9447fa6d24
No known key found for this signature in database
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/desktops/cinnamon/cinnamon-common/default.nix
View file

@ -72,13 +72,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cinnamon-common"; pname = "cinnamon-common";
version = "5.6.8"; version = "5.8.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxmint"; owner = "linuxmint";
repo = "cinnamon"; repo = "cinnamon";
rev = version; rev = version;
hash = "sha256-qL8GaEH/0d4yEwwdaR55fTp0RitbyptoxKOBO3nmbic="; hash = "sha256-KY5ctByMYKxigiZ0X/blaHJuyiAUNB6B2gpGtC/k100=";
}; };
patches = [ patches = [
@ -166,6 +166,7 @@ stdenv.mkDerivation rec {
substituteInPlace ./bin/SettingsWidgets.py --replace "/usr/share/sounds" "/run/current-system/sw/share/sounds" substituteInPlace ./bin/SettingsWidgets.py --replace "/usr/share/sounds" "/run/current-system/sw/share/sounds"
substituteInPlace ./bin/Spices.py --replace "msgfmt" "${gettext}/bin/msgfmt" substituteInPlace ./bin/Spices.py --replace "msgfmt" "${gettext}/bin/msgfmt"
substituteInPlace ./modules/cs_info.py --replace "lspci" "${pciutils}/bin/lspci" 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 popd
sed "s| cinnamon-session| ${cinnamon-session}/bin/cinnamon-session|g" -i ./files/usr/bin/cinnamon-session-{cinnamon,cinnamon2d} sed "s| cinnamon-session| ${cinnamon-session}/bin/cinnamon-session|g" -i ./files/usr/bin/cinnamon-session-{cinnamon,cinnamon2d}

1
pkgs/desktops/cinnamon/cinnamon-common/libdir.patch
View file

@ -17,6 +17,7 @@ index 3c1e9a4f..a77d9b3c 100644
schemadir = join_paths(datadir, 'glib-2.0', 'schemas') schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
-pkglibdir = join_paths(libdir, meson.project_name().to_lower()) -pkglibdir = join_paths(libdir, meson.project_name().to_lower())
+pkglibdir = libdir +pkglibdir = libdir
girdir = join_paths(datadir, 'gir-1.0')
servicedir = join_paths(datadir, 'dbus-1', 'services') servicedir = join_paths(datadir, 'dbus-1', 'services')
pkgdatadir = join_paths(datadir, meson.project_name().to_lower()) pkgdatadir = join_paths(datadir, meson.project_name().to_lower())
po_dir = join_paths(meson.source_root(), 'po') po_dir = join_paths(meson.source_root(), 'po')