b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #236641 from bobby285271/upd/cinnamon-bpo

Browse source 
Cinnamon updates 2023-06-08
This commit is contained in:
Bobby Rong 2023-06-08 21:34:42 +08:00 committed by GitHub
parent ff3f331e40 33e6485a1c
commit 97740d3f31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 32 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/misc/sticky/default.nix
View file

@ -12,14 +12,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "sticky";
version = "1.14";
version = "1.16";
format = "other";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-7UZbCbzQ1ZrSzxTUdbA+wsH3p27qj/c/cM4GY/kzG6E=";
hash = "sha256-+opzjvSdGwwn1imNzSsfD9rfs4naSXzcMBJRPhKW2WM=";
};
postPatch = ''

4
pkgs/desktops/cinnamon/bulky/default.nix
View file

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "bulky";
version = "2.8";
version = "2.9";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "bulky";
rev = version;
hash = "sha256-DZjX4xPyA30TTyOX+VyGSY/FWPX2316CYImDWRma9r0=";
hash = "sha256-eCu7AgL4bzstu8vsqBJImRZm1qMVnnycuOShY5fB+C4=";
};
nativeBuildInputs = [

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

@ -155,20 +155,20 @@ stdenv.mkDerivation rec {
-e s,/usr/share/locale,/run/current-system/sw/share/locale,g \
{} +
sed "s|/usr/share/sounds|/run/current-system/sw/share/sounds|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py
# All optional and may introduce circular dependency.
find ./files/usr/share/cinnamon/applets -type f -exec sed -i \
-e '/^#/!s,/usr/bin,/run/current-system/sw/bin,g' \
{} +
sed "s|'python3'|'${pythonEnv.interpreter}'|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/CinnamonGtkSettings.py
pushd ./files/usr/share/cinnamon/cinnamon-settings
substituteInPlace ./bin/capi.py --replace '"/usr/lib"' '"${cinnamon-control-center}/lib"'
substituteInPlace ./bin/CinnamonGtkSettings.py --replace "'python3'" "'${pythonEnv.interpreter}'"
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"
popd
sed "s|/usr/bin/cinnamon-screensaver-command|/run/current-system/sw/bin/cinnamon-screensaver-command|g" \
-i ./files/usr/share/cinnamon/applets/menu@cinnamon.org/applet.js -i ./files/usr/share/cinnamon/applets/user@cinnamon.org/applet.js
sed "s|\"/usr/lib\"|\"${cinnamon-control-center}/lib\"|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/capi.py
sed 's|"lspci"|"${pciutils}/bin/lspci"|g' -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py
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|msgfmt|${gettext}/bin/msgfmt|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/Spices.py
sed "s| cinnamon-session| ${cinnamon-session}/bin/cinnamon-session|g" -i ./files/usr/bin/cinnamon-session-{cinnamon,cinnamon2d}
patchShebangs src/data-to-c.pl
'';
@ -179,9 +179,16 @@ stdenv.mkDerivation rec {
--prefix XDG_DATA_DIRS : "${gnome.caribou}/share"
)
buildPythonPath "$out ${python3.pkgs.xapp}"
# https://github.com/NixOS/nixpkgs/issues/200397
patchPythonScript $out/bin/cinnamon-spice-updater
# https://github.com/NixOS/nixpkgs/issues/129946
buildPythonPath "${python3.pkgs.xapp}"
patchPythonScript $out/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py
# Called as `pkexec cinnamon-settings-users.py`.
wrapGApp $out/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
'';
passthru = {

6
pkgs/desktops/cinnamon/mint-cursor-themes/default.nix
View file

@ -5,14 +5,14 @@
stdenvNoCC.mkDerivation rec {
pname = "mint-cursor-themes";
version = "1.0.1";
version = "1.0.2";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
# They don't really do tags, this is just a named commit.
rev = "e17f8a4620827235dabbe5221bd0ee8c44dad0d5";
hash = "sha256-yLUmIVh884uDVkNil7qxf6t/gykipzBvPgzwmY3zvQk=";
rev = "d2c1428b499a347c291dafb13c89699fdbdd4be7";
hash = "sha256-i2Wf+OKwal9G5hkcAdmGSgX6txu1AHajqqPJdhpJoA0=";
};
installPhase = ''

4
pkgs/desktops/cinnamon/warpinator/default.nix
View file

@ -33,13 +33,13 @@ let
in
stdenv.mkDerivation rec {
pname = "warpinator";
version = "1.6.2";
version = "1.6.3";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-crGW1FBfTEiKqx981EzG414we4icyBv/keGtMlr8UFc=";
hash = "sha256-iCq2cwZgsq5/bJqjYuZ6dZLqz2nIpgHCrIQeMVxJNXY=";
};
nativeBuildInputs = [

7
pkgs/desktops/cinnamon/xapp/default.nix
View file

@ -79,12 +79,11 @@ stdenv.mkDerivation rec {
# Patch pastebin & inxi location
sed "s|/usr/bin/pastebin|$out/bin/pastebin|" -i scripts/upload-system-info
sed "s|'inxi'|'${inxi}/bin/inxi'|" -i scripts/upload-system-info
# Patch gtk3 module target dir
substituteInPlace libxapp/meson.build \
--replace "gtk3_dep.get_pkgconfig_variable('libdir')" "'$out'"
'';
# Fix gtk3 module target dir. Proper upstream solution should be using define_variable.
PKG_CONFIG_GTK__3_0_LIBDIR = "${placeholder "out"}/lib";
meta = with lib; {
homepage = "https://github.com/linuxmint/xapp";
description = "Cross-desktop libraries and common resources";