diff options
Diffstat (limited to 'nixpkgs/pkgs/desktops/cinnamon')
13 files changed, 106 insertions, 31 deletions
diff --git a/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 678bcfcd14cd..2f6f2f77ba4c 100644 --- a/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -71,13 +71,13 @@ let in stdenv.mkDerivation rec { pname = "cinnamon-common"; - version = "6.0.1"; + version = "6.0.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - hash = "sha256-QEJNBQnj4vXZim5HsRY15VU2CBbnsw/jtSP9JRbWpog="; + hash = "sha256-8Y+WUnNQ4p/JeUR4q6Ti6HdoN5bghXs6XJsuWGY66S4="; }; patches = [ diff --git a/nixpkgs/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/nixpkgs/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index f3bc244eba00..17d846f305b2 100644 --- a/nixpkgs/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/nixpkgs/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , pkg-config , meson , ninja @@ -29,24 +28,15 @@ stdenv.mkDerivation rec { pname = "cinnamon-screensaver"; - version = "6.0.0"; + version = "6.0.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-5hXhCPXC7b2SsmvNSLDe/WYQcufN7FfhnaAgTNtqg0I="; + hash = "sha256-6Js670Z3/5BwAHvEJrXJkBZvEvx1NeT+eXOKaqKqFqI="; }; - patches = [ - # Fix broken theming with pygobject >= 3.46.0 - # https://github.com/linuxmint/cinnamon-screensaver/issues/446 - (fetchpatch { - url = "https://github.com/linuxmint/cinnamon-screensaver/commit/37ab8ed18f35591f2bd99043f12c06d98b4527db.patch"; - hash = "sha256-4YSithosyTLy8OFu6DEhLT4c+EGEg84EenTKAiBiWo4="; - }) - ]; - nativeBuildInputs = [ pkg-config wrapGAppsHook diff --git a/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/0002-Use-login-shell-for-wayland-session.patch b/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/0002-Use-login-shell-for-wayland-session.patch new file mode 100644 index 000000000000..6c44f93d8f3c --- /dev/null +++ b/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/0002-Use-login-shell-for-wayland-session.patch @@ -0,0 +1,76 @@ +From 174d14edcbb401aa2bfb77932b214512befb486c Mon Sep 17 00:00:00 2001 +From: Bobby Rong <rjl931189261@126.com> +Date: Sat, 23 Dec 2023 23:24:59 +0800 +Subject: [PATCH] cinnamon-session: make sure wayland sessions get a login + shell + +Users expect their shell profiles to get sourced at startup, which +doesn't happen with wayland sessions. + +This commit brings back that feature, by making the cinnamon-session +wrapper script run a login shell. + +ref: https://gitlab.gnome.org/GNOME/gnome-session/-/commit/7e307f8ddb91db5d4051c4c792519a660ba67f35 +--- + cinnamon-session/cinnamon-session.in | 16 ++++++++++++++++ + cinnamon-session/meson.build | 14 +++++++++++++- + 2 files changed, 29 insertions(+), 1 deletion(-) + create mode 100755 cinnamon-session/cinnamon-session.in + +diff --git a/cinnamon-session/cinnamon-session.in b/cinnamon-session/cinnamon-session.in +new file mode 100755 +index 0000000..d9d7cb2 +--- /dev/null ++++ b/cinnamon-session/cinnamon-session.in +@@ -0,0 +1,16 @@ ++#!/bin/sh ++ ++if [ "x$XDG_SESSION_TYPE" = "xwayland" ] && ++ [ "x$XDG_SESSION_CLASS" != "xgreeter" ] && ++ [ -n "$SHELL" ] && ++ grep -q "$SHELL" /etc/shells && ++ ! (echo "$SHELL" | grep -q "false") && ++ ! (echo "$SHELL" | grep -q "nologin"); then ++ if [ "$1" != '-l' ]; then ++ exec bash -c "exec -l '$SHELL' -c '$0 -l $*'" ++ else ++ shift ++ fi ++fi ++ ++exec @libexecdir@/cinnamon-session-binary "$@" +diff --git a/cinnamon-session/meson.build b/cinnamon-session/meson.build +index 10092ee..3d32fdc 100644 +--- a/cinnamon-session/meson.build ++++ b/cinnamon-session/meson.build +@@ -54,7 +54,7 @@ cinnamon_session_sources = [ + ] + + dbus_glib = dependency('dbus-glib-1') +-executable('cinnamon-session', ++executable('cinnamon-session-binary', + cinnamon_session_sources, + dependencies: [ + cinnamon_desktop, +@@ -76,6 +76,18 @@ executable('cinnamon-session', + ], + include_directories: [ rootInclude ], + install: true, ++ install_dir: get_option('libexecdir'), ++) ++ ++script_conf = configuration_data() ++script_conf.set('libexecdir', get_option('prefix') / get_option('libexecdir')) ++ ++configure_file( ++ input: 'cinnamon-session.in', ++ output: 'cinnamon-session', ++ install: true, ++ install_dir: get_option('bindir'), ++ configuration: script_conf + ) + + units = [ +-- +2.42.0 + diff --git a/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/default.nix index a6800f94737d..a0dfab6503c2 100644 --- a/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/default.nix +++ b/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { patches = [ ./0001-Use-dbus_glib-instead-of-elogind.patch + ./0002-Use-login-shell-for-wayland-session.patch ]; buildInputs = [ diff --git a/nixpkgs/pkgs/desktops/cinnamon/folder-color-switcher/default.nix b/nixpkgs/pkgs/desktops/cinnamon/folder-color-switcher/default.nix index c9dd7759cb0c..69a3aade31d7 100644 --- a/nixpkgs/pkgs/desktops/cinnamon/folder-color-switcher/default.nix +++ b/nixpkgs/pkgs/desktops/cinnamon/folder-color-switcher/default.nix @@ -7,14 +7,14 @@ stdenvNoCC.mkDerivation rec { pname = "folder-color-switcher"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; # They don't really do tags, this is just a named commit. - rev = "826df0b71c7c3b686421437eac86883945dc5956"; - sha256 = "sha256-WdOTyladZ0U39wbhqsXzg9l3mJ5UGV99yVg1PWscP2w="; + rev = "ebab2114649cc688a05e30857f6706f16fe82307"; + sha256 = "sha256-/VbgFuSoeDIiJG4owXbn7yT0ILrAdKkkhSkScnnJa+8="; }; nativeBuildInputs = [ @@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation rec { postPatch = '' substituteInPlace usr/share/nemo-python/extensions/nemo-folder-color-switcher.py \ - --replace "/usr/share/locale" "$out/share" \ + --replace "/usr/share/locale" "$out/share/locale" \ --replace "/usr/share/folder-color-switcher/colors.d" "/run/current-system/sw/share/folder-color-switcher/colors.d" \ --replace "/usr/share/folder-color-switcher/color.svg" "$out/share/folder-color-switcher/color.svg" diff --git a/nixpkgs/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/nixpkgs/pkgs/desktops/cinnamon/mint-y-icons/default.nix index b5d2df761fad..4742e7af8308 100644 --- a/nixpkgs/pkgs/desktops/cinnamon/mint-y-icons/default.nix +++ b/nixpkgs/pkgs/desktops/cinnamon/mint-y-icons/default.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-y-icons"; - version = "1.7.0"; + version = "1.7.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-T2tZUMXc3kvTFkWf9AGUTNkkmQ0OT8qTKpQk+ZuvEc0="; + hash = "sha256-8dwJyvM5sQNtUzhreBCgSWeElGlp/z3Dk7/xCeUSGKU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/desktops/cinnamon/muffin/default.nix b/nixpkgs/pkgs/desktops/cinnamon/muffin/default.nix index 98ee19c27e78..893ddf065333 100644 --- a/nixpkgs/pkgs/desktops/cinnamon/muffin/default.nix +++ b/nixpkgs/pkgs/desktops/cinnamon/muffin/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { pname = "muffin"; - version = "6.0.0"; + version = "6.0.1"; outputs = [ "out" "dev" "man" ]; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-17B2C3SW9smTgLBBGJc9LwFpXoP9WidZEGgI2hbJTH8="; + hash = "sha256-yd23naaPIa6xrdf7ipOvVZKqkr7/CMxNqDZ3CQ2QH+Y="; }; patches = [ diff --git a/nixpkgs/pkgs/desktops/cinnamon/nemo-extensions/nemo-emblems/default.nix b/nixpkgs/pkgs/desktops/cinnamon/nemo-extensions/nemo-emblems/default.nix index d298827487e9..bd9f808638f2 100644 --- a/nixpkgs/pkgs/desktops/cinnamon/nemo-extensions/nemo-emblems/default.nix +++ b/nixpkgs/pkgs/desktops/cinnamon/nemo-extensions/nemo-emblems/default.nix @@ -1,6 +1,7 @@ { python3 , lib , fetchFromGitHub +, cinnamon-translations }: let @@ -17,6 +18,9 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace setup.py \ --replace "/usr/share" "share" + + substituteInPlace nemo-extension/nemo-emblems.py \ + --replace "/usr/share/locale" "${cinnamon-translations}/share/locale" ''; meta = with lib; { diff --git a/nixpkgs/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix b/nixpkgs/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix index 71c61db992a8..7bf706f83b5f 100644 --- a/nixpkgs/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix +++ b/nixpkgs/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix @@ -8,6 +8,7 @@ , gtk3 , nemo , gnome +, cinnamon-translations }: let @@ -33,7 +34,8 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/nemo-fileroller.c \ - --replace "file-roller" "${lib.getExe gnome.file-roller}" + --replace "file-roller" "${lib.getExe gnome.file-roller}" \ + --replace "GNOMELOCALEDIR" "${cinnamon-translations}/share/locale" ''; PKG_CONFIG_LIBNEMO_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/${nemo.extensiondir}"; diff --git a/nixpkgs/pkgs/desktops/cinnamon/nemo-extensions/srcs.nix b/nixpkgs/pkgs/desktops/cinnamon/nemo-extensions/srcs.nix index c59538a40a44..a5ab9dfe9b3e 100644 --- a/nixpkgs/pkgs/desktops/cinnamon/nemo-extensions/srcs.nix +++ b/nixpkgs/pkgs/desktops/cinnamon/nemo-extensions/srcs.nix @@ -4,12 +4,12 @@ rec { # When you bump this, you should make sure all nemo-extensions # are actually using this file since we try to deal with tags # like nemo-fileroller-5.6.1 according to upstream's wishes. - version = "6.0.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = "nemo-extensions"; rev = version; - sha256 = "sha256-M8ImntyfFfSL591UpqZosE7F8ydbpfrBhcLOBtW/sGQ="; + sha256 = "sha256-zuE0SO5VJ2kKjK7JgsSf+wJgfyffTHhfICslEoPKK8Q="; }; } diff --git a/nixpkgs/pkgs/desktops/cinnamon/nemo/default.nix b/nixpkgs/pkgs/desktops/cinnamon/nemo/default.nix index 406bcd132511..7b124c7987da 100644 --- a/nixpkgs/pkgs/desktops/cinnamon/nemo/default.nix +++ b/nixpkgs/pkgs/desktops/cinnamon/nemo/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "nemo"; - version = "6.0.0"; + version = "6.0.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-JeiBhgfGyGyNT9eNhtUl6Pp1jgG02NRlm5lam592lS0="; + sha256 = "sha256-vSLFp0sgqGsZtcXdv82PVH0HcBbmcxrMySLFCBrLJpA="; }; patches = [ diff --git a/nixpkgs/pkgs/desktops/cinnamon/warpinator/default.nix b/nixpkgs/pkgs/desktops/cinnamon/warpinator/default.nix index 4ccb373d0666..0539075ca51d 100644 --- a/nixpkgs/pkgs/desktops/cinnamon/warpinator/default.nix +++ b/nixpkgs/pkgs/desktops/cinnamon/warpinator/default.nix @@ -36,13 +36,13 @@ let in stdenv.mkDerivation rec { pname = "warpinator"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-dxbs2Qq1Ix04yIA587tntLJ3W/pnA0wTiQ4BB5GCTR0="; + hash = "sha256-wBln4YqjZ8aI3D4Arwa7UgDKxNPSlC5fRZtjanTHl4Q="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/desktops/cinnamon/xreader/default.nix b/nixpkgs/pkgs/desktops/cinnamon/xreader/default.nix index 828a9afbdb60..c20177e043ee 100644 --- a/nixpkgs/pkgs/desktops/cinnamon/xreader/default.nix +++ b/nixpkgs/pkgs/desktops/cinnamon/xreader/default.nix @@ -7,6 +7,7 @@ , shared-mime-info , gtk3 , wrapGAppsHook +, libarchive , libxml2 , xapp , meson @@ -26,13 +27,13 @@ stdenv.mkDerivation rec { pname = "xreader"; - version = "3.8.4"; + version = "4.0.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-eSMPXBJ+VIMrIy86mMbRtZ28DvX7aCzLAAQ+RWqlCpc="; + sha256 = "sha256-sADdslxDtI+zV8DLnczlzNtB9W+BhMP8vb5riSnPYaw="; }; nativeBuildInputs = [ @@ -54,6 +55,7 @@ stdenv.mkDerivation rec { gtk3 xapp cairo + libarchive libxml2 libsecret poppler |