diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-10-17 10:05:29 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-17 10:05:29 +0800 |
| commit | 05648fddf2a18fb15afb511f63988810274a6d1b (patch) | |
| tree | 66cef6ee0a335adb5cc7f53f6769436204e57a74 | |
| parent | python3Packages.pytest-randomly: change hash after 25bafc8f1d6e8aa1fdfffbd6b4... (diff) | |
| parent | maintainers: add bobby285271 to cinnamon maintainer (diff) | |
| download | nixpkgs-05648fddf2a18fb15afb511f63988810274a6d1b.tar.gz | |
Merge pull request #196285 from bobby285271/cinnamon-stable
[22.05] cinnamon.cinnamon-common: many fixes
| -rw-r--r-- | maintainers/team-list.nix | 1 | ||||
| -rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-common/default.nix | 21 |
2 files changed, 21 insertions, 1 deletions
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 6c43cc877df8..01375947425b 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -93,6 +93,7 @@ with lib.maintainers; { cinnamon = { members = [ + bobby285271 mkg20001 ]; scope = "Maintain Cinnamon desktop environment and applications made by the LinuxMint team."; diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 303443cc5f9e..34f54b3e9737 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -10,6 +10,7 @@ , cjs , fetchFromGitHub , gdk-pixbuf +, gettext , libgnomekbd , glib , gobject-introspection @@ -120,6 +121,7 @@ stdenv.mkDerivation rec { wrapGAppsHook intltool gtk-doc + python3.pkgs.wrapPython ]; # use locales from cinnamon-translations (not using --localedir because datadir is used) @@ -136,9 +138,13 @@ stdenv.mkDerivation rec { sed "s|/usr/share/sounds|/run/current-system/sw/share/sounds|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py sed "s|/usr/bin/upload-system-info|${xapps}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py - sed "s|upload-system-info|${xapps}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py + sed "s|\"upload-system-info\"|\"${xapps}/bin/upload-system-info\"|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py sed "s|/usr/bin/cinnamon-control-center|${cinnamon-control-center}/bin/cinnamon-control-center|g" -i ./files/usr/bin/cinnamon-settings + + 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 + # this one really IS optional sed "s|/usr/bin/gnome-control-center|/run/current-system/sw/bin/gnome-control-center|g" -i ./files/usr/bin/cinnamon-settings @@ -151,6 +157,19 @@ 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 + + sed "s|msgfmt|${gettext}/bin/msgfmt|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/Spices.py + ''; + + preFixup = '' + # https://github.com/NixOS/nixpkgs/issues/101881 + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gnome.caribou}/share" + ) + + # https://github.com/NixOS/nixpkgs/issues/129946 + buildPythonPath "${python3.pkgs.xapp}" + patchPythonScript $out/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py ''; passthru = { |