diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-08 12:02:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-08 12:02:12 +0000 |
| commit | cdfb8a30a44056abfab2d5b2ec7b105c5e24226d (patch) | |
| tree | 4a117140b51b0a57d951dd3ee3ea28c8b3d5f64b /pkgs/desktops | |
| parent | 7d7030c6d5f2ed10d9ddd91199dd09b94ce5d003 (diff) | |
| parent | 1b60238acd96038c0a52ee73c012194d506eb432 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/desktops')
4 files changed, 28 insertions, 2 deletions
diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 69c687912e071..7ddcada83b510 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -153,6 +153,10 @@ stdenv.mkDerivation rec { sed "s|\"upload-system-info\"|\"${xapp}/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 diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix index 7be3b6d44c15e..97fa6fc1ea65b 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix @@ -13,13 +13,13 @@ stdenvNoCC.mkDerivation rec { pname = "elementary-icon-theme"; - version = "7.0.0"; + version = "7.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = "icons"; rev = version; - sha256 = "sha256-tyhKhZPoZ8xVy1KVUWd8BK2meTT3Z6qM787spjE+NL8="; + sha256 = "sha256-SMeVu4RbXodbxtVkQE2tvv6LaVWzrq7UBlwmi30ns2Q="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 811ed736e7a52..7cbf02fef8dd7 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -137,6 +137,8 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-systemload-plugin = callPackage ./panel-plugins/xfce4-systemload-plugin { }; + xfce4-time-out-plugin = callPackage ./panel-plugins/xfce4-time-out-plugin { }; + xfce4-timer-plugin = callPackage ./panel-plugins/xfce4-timer-plugin { }; xfce4-verve-plugin = callPackage ./panel-plugins/xfce4-verve-plugin { }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-time-out-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-time-out-plugin/default.nix new file mode 100644 index 0000000000000..6939dc42b31c8 --- /dev/null +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-time-out-plugin/default.nix @@ -0,0 +1,20 @@ +{ lib, mkXfceDerivation, gtk3, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: + +mkXfceDerivation { + category = "panel-plugins"; + pname = "xfce4-time-out-plugin"; + version = "1.1.2"; + rev-prefix = "xfce4-time-out-plugin-"; + odd-unstable = false; + sha256 = "sha256-xfkQjlUfvm0YXs3bRJD4W/71VkaPq3Y+cDFVNiL/bjc="; + + buildInputs = [ + gtk3 libxfce4ui libxfce4util xfce4-panel xfconf + ]; + + meta = with lib; { + description = "Panel plug-in to take periodical breaks from the computer"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ] ++ teams.xfce.members; + }; +} |