diff options
Diffstat (limited to 'pkgs/desktops/cinnamon')
22 files changed, 71 insertions, 149 deletions
diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index a548b8a6503dd..a2592cb39a399 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -9,7 +9,6 @@ , cjs , evolution-data-server , fetchFromGitHub -, fetchpatch , gdk-pixbuf , gettext , libgnomekbd @@ -72,25 +71,18 @@ let in stdenv.mkDerivation rec { pname = "cinnamon-common"; - version = "6.0.4"; + version = "6.2.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - hash = "sha256-I0GJv2lcl5JlKPIiWoKMXTf4OLkznS5MpiOIvZ76bJQ="; + hash = "sha256-u5QsUFRXPVsk9T7tVmuOpTaAxdMIJs5yPVcWM1olXz8="; }; patches = [ ./use-sane-install-dir.patch ./libdir.patch - - # Switch to GNOME Online Accounts GTK - (fetchpatch { - url = "https://github.com/linuxmint/cinnamon/commit/d22f889c376734f0ca5d904885c2772e790fbadc.patch"; - includes = [ "files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py" ]; - hash = "sha256-xutJqxtzk3/BUQGZY/tnBkRyAfZZY7AckaGC6b7Sfn8="; - }) ]; buildInputs = [ @@ -166,6 +158,7 @@ stdenv.mkDerivation rec { --replace-fail 'subprocess.run(["/usr/bin/' 'subprocess.run(["' \ --replace-fail "msgfmt" "${gettext}/bin/msgfmt" substituteInPlace ./modules/cs_info.py --replace-fail "lspci" "${pciutils}/bin/lspci" + substituteInPlace ./modules/cs_keyboard.py --replace-fail "/usr/bin/cinnamon-dbus-command" "$out/bin/cinnamon-dbus-command" substituteInPlace ./modules/cs_themes.py --replace-fail "$out/share/cinnamon/styles.d" "/run/current-system/sw/share/cinnamon/styles.d" popd @@ -178,17 +171,6 @@ stdenv.mkDerivation rec { postInstall = '' # Use locales from cinnamon-translations. ln -s ${cinnamon-translations}/share/locale $out/share/locale - - # Do not install online accounts module, with a -Donlineaccounts=false c-c-c - # this just shows an empty page. - rm -f $out/share/cinnamon/cinnamon-settings/modules/cs_online_accounts.py - - # g-o-a-gtk already provides its own desktop item. - rm -f $out/share/applications/cinnamon-settings-online-accounts.desktop - - # Actually removes Adwaita and HighContrast from Cinnamon styles with mint-artwork 1.8.2. - # https://github.com/linuxmint/cinnamon/commit/13b1ad104e88197f6c4e2d02ab2674c07254b8e8 - rm -r $out/share/cinnamon/styles.d ''; preFixup = '' diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index 55ca24d57de0e..b5a98a9090b95 100644 --- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-control-center"; - version = "6.0.1"; + version = "6.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-AYnI+k6CzpWUutusCSDR5KhOmv5FWoChotAbCJXTh4I="; + hash = "sha256-Blod69RzPTE3DztRo0PK0MKCE+vq0HWrcJcC/1e8eRI="; }; buildInputs = [ @@ -83,8 +83,6 @@ stdenv.mkDerivation rec { mesonFlags = [ # use locales from cinnamon-translations "--localedir=${cinnamon-translations}/share/locale" - # https://github.com/linuxmint/cinnamon-control-center/issues/326 - "-Donlineaccounts=false" ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix index 830abafa28538..9bb7b706f02dd 100644 --- a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-desktop"; - version = "6.0.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-Ay9JyPBsE345dBwQHChkaGuoXiB2nPyvCNhWWphL8kY="; + hash = "sha256-9uewZh0GHQAenTcZpLchgFXSt3vOhxLbaepsJIkjTdI="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix index 78a4f7d94b654..7234d00d9c06e 100644 --- a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix @@ -2,7 +2,7 @@ , runCommand , nixos-artwork , glib -, gnome +, gnome-terminal , gtk3 , gsettings-desktop-schemas , extraGSettingsOverrides ? "" @@ -36,7 +36,7 @@ let cinnamon-session cinnamon-settings-daemon cinnamon-common - gnome.gnome-terminal + gnome-terminal gsettings-desktop-schemas gtk3 ] ++ extraGSettingsOverridePackages; diff --git a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix index e184e64a889e9..62066ff8dadef 100644 --- a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-menus"; - version = "6.0.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-zP1jA5Fwxh6QrM5YwJo7SFPWaxkJsv1D84dhIDP5xuI="; + hash = "sha256-HOipeUV9daPSsJ+SHPlsyEAg2SwKQkZBm1JUoNtDZAY="; }; buildInputs = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index f08a242d4665c..f67ba3a2b82ae 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-screensaver"; - version = "6.0.3"; + version = "6.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-ncYE2dCIAQxCMCe/5zrDU9iHTIkw+iO/IQl8+pfTvLI="; + hash = "sha256-hXgDTQnOlskzyOogvk7BQ9iJ3oXRtgUUX5bXtgD+gFo="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-session/0001-Use-dbus_glib-instead-of-elogind.patch b/pkgs/desktops/cinnamon/cinnamon-session/0001-Use-dbus_glib-instead-of-elogind.patch index 1b56b3903f3bd..368e49bb84aa2 100644 --- a/pkgs/desktops/cinnamon/cinnamon-session/0001-Use-dbus_glib-instead-of-elogind.patch +++ b/pkgs/desktops/cinnamon/cinnamon-session/0001-Use-dbus_glib-instead-of-elogind.patch @@ -16,10 +16,10 @@ index d8428dc..1f15115 100644 ] +dbus_glib = dependency('dbus-glib-1') - executable('cinnamon-session', + executable('cinnamon-session-binary', cinnamon_session_sources, dependencies: [ -@@ -74,7 +75,7 @@ executable('cinnamon-session', +@@ -74,7 +75,7 @@ executable('cinnamon-session-binary', xext, xrender, xtest, diff --git a/pkgs/desktops/cinnamon/cinnamon-session/0002-Use-login-shell-for-wayland-session.patch b/pkgs/desktops/cinnamon/cinnamon-session/0002-Use-login-shell-for-wayland-session.patch deleted file mode 100644 index 6c44f93d8f3c2..0000000000000 --- a/pkgs/desktops/cinnamon/cinnamon-session/0002-Use-login-shell-for-wayland-session.patch +++ /dev/null @@ -1,76 +0,0 @@ -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/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/pkgs/desktops/cinnamon/cinnamon-session/default.nix index 47cedfa0a6f5c..a7262b2f937c4 100644 --- a/pkgs/desktops/cinnamon/cinnamon-session/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-session/default.nix @@ -32,18 +32,17 @@ let in stdenv.mkDerivation rec { pname = "cinnamon-session"; - version = "6.0.4"; + version = "6.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-GtaoqzcnpKbiP4OqhnLkNWzZTUqX/KgVE6JImNMkdGo="; + hash = "sha256-2KQJNUc/uvbXnqqV0Yt3cltTHNbCo+wK67NXlid02Sk="; }; patches = [ ./0001-Use-dbus_glib-instead-of-elogind.patch - ./0002-Use-login-shell-for-wayland-session.patch ]; buildInputs = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix index 115ffcdece190..b704f21e294bc 100644 --- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-settings-daemon"; - version = "6.0.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-bT6NetCBo3J9IiiJ9Hs4iC1N3n/AP9Q+6wZciuKA4i4="; + hash = "sha256-OAG5Tes+0bi+vKqm77Y7OykTpUkMdRaXIJYLuomIDMo="; }; patches = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix index 0c7f018752a3e..4854cf671bc1d 100644 --- a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-translations"; - version = "6.0.2"; + version = "6.2.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-kLZ0niamPV5Kaq6ZBTp1SMAl6dKMkcC+rodtAoH5+Go="; + hash = "sha256-U/3+njVctLbu+n/HQ+YuGdGhNN7eWU5u9OEFOz4T69o="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix index 4ff139ba787e8..bb7ab672dbf0d 100644 --- a/pkgs/desktops/cinnamon/cjs/default.nix +++ b/pkgs/desktops/cinnamon/cjs/default.nix @@ -6,8 +6,10 @@ , cairo , glib , readline -, spidermonkey_102 +, libsysprof-capture +, spidermonkey_115 , meson +, mesonEmulatorHook , dbus , ninja , which @@ -16,13 +18,13 @@ stdenv.mkDerivation rec { pname = "cjs"; - version = "6.0.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cjs"; rev = version; - hash = "sha256-oSqEAZWEVb8NxFTScl8s5Mb04tCGDyVVslYW00s4YYk="; + hash = "sha256-/74E10txRjwN9RkjVB8M0MPYakJ659yJWanc4DC09wg="; }; outputs = [ "out" "dev" ]; @@ -33,21 +35,24 @@ stdenv.mkDerivation rec { pkg-config which # for locale detection libxml2 # for xml-stripblanks + dbus # for dbus-run-session gobject-introspection + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ cairo readline - spidermonkey_102 - dbus # for dbus-run-session + libsysprof-capture + spidermonkey_115 ]; propagatedBuildInputs = [ glib ]; - mesonFlags = [ + mesonFlags = lib.optionals stdenv.hostPlatform.isMusl [ "-Dprofiler=disabled" ]; diff --git a/pkgs/desktops/cinnamon/mint-artwork/default.nix b/pkgs/desktops/cinnamon/mint-artwork/default.nix index ef2c6ec4fa2c4..b4b3d91ffcf3e 100644 --- a/pkgs/desktops/cinnamon/mint-artwork/default.nix +++ b/pkgs/desktops/cinnamon/mint-artwork/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "mint-artwork"; - version = "1.8.2"; + version = "1.8.3"; src = fetchurl { urls = [ "http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" - "https://web.archive.org/web/20240505123538/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" + "https://web.archive.org/web/20240629131305/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" ]; - hash = "sha256-MegMFrnU8Gcc2v5y3BQCIZS31JdpfSM5FIJJNcyt4LY="; + hash = "sha256-NaInP600QQ9sNRaJgM9SNyawZz1H8gwiuZ4lf8KJnIk="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/mint-l-icons/default.nix b/pkgs/desktops/cinnamon/mint-l-icons/default.nix index 6a3956e53ca96..f1333ee44c18f 100644 --- a/pkgs/desktops/cinnamon/mint-l-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-l-icons/default.nix @@ -1,7 +1,7 @@ { stdenvNoCC , lib , fetchFromGitHub -, gnome +, adwaita-icon-theme , gnome-icon-theme , hicolor-icon-theme , gtk3 @@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec { }; propagatedBuildInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme gnome-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/desktops/cinnamon/mint-l-theme/default.nix b/pkgs/desktops/cinnamon/mint-l-theme/default.nix index a9a8a5bd68503..214ebb999785f 100644 --- a/pkgs/desktops/cinnamon/mint-l-theme/default.nix +++ b/pkgs/desktops/cinnamon/mint-l-theme/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-l-theme"; - version = "1.9.7"; + version = "1.9.8"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-pgb1lkrBRDYgfrLx0/afEuTz+5gZt/IG1u+dn4V7Spo="; + hash = "sha256-Jql4NJ8jugy0wi5yT+/Mr5fwxLog37w0VvHhxyMvMlk="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/mint-themes/default.nix b/pkgs/desktops/cinnamon/mint-themes/default.nix index e1e22781690b4..13db58183cb56 100644 --- a/pkgs/desktops/cinnamon/mint-themes/default.nix +++ b/pkgs/desktops/cinnamon/mint-themes/default.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-themes"; - version = "2.1.7"; + version = "2.1.8"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-pakD7qVlivokFlIBNjibOkneS6WV4BBOBePWSOjVVy0="; + hash = "sha256-mkcIhZRaOUom1Rurz/IO646FSF50efLN6xfesPdyVHc="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/mint-x-icons/default.nix b/pkgs/desktops/cinnamon/mint-x-icons/default.nix index 8b045980c44a1..85961146d75d6 100644 --- a/pkgs/desktops/cinnamon/mint-x-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-x-icons/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub , lib , stdenvNoCC -, gnome +, adwaita-icon-theme , gnome-icon-theme , hicolor-icon-theme , gtk3 @@ -11,17 +11,17 @@ stdenvNoCC.mkDerivation rec { pname = "mint-x-icons"; - version = "1.6.9"; + version = "1.7.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-J5Osy+VosyBhwiiwELMtjDTf3/J6DpuQ4c9DO06fo+4="; + hash = "sha256-X3aEGz5mr6hL3HhKb69b1/smY+Fh7BIkzdXdOhSkMg0="; }; propagatedBuildInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme gnome-icon-theme hicolor-icon-theme humanity-icon-theme diff --git a/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/pkgs/desktops/cinnamon/mint-y-icons/default.nix index f12800e384b43..09c01f3e9dfd5 100644 --- a/pkgs/desktops/cinnamon/mint-y-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-y-icons/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub , lib , stdenvNoCC -, gnome +, adwaita-icon-theme , gnome-icon-theme , hicolor-icon-theme , gtk3 @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec { }; propagatedBuildInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme gnome-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix index 08a9d3bf91b6b..328fe440cde12 100644 --- a/pkgs/desktops/cinnamon/muffin/default.nix +++ b/pkgs/desktops/cinnamon/muffin/default.nix @@ -8,7 +8,6 @@ , desktop-file-utils , egl-wayland , glib -, gnome , gobject-introspection , graphene , gtk3 @@ -36,11 +35,12 @@ , wrapGAppsHook3 , xorgserver , xwayland +, zenity }: stdenv.mkDerivation rec { pname = "muffin"; - version = "6.0.1"; + version = "6.2.0"; outputs = [ "out" "dev" "man" ]; @@ -48,13 +48,13 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-yd23naaPIa6xrdf7ipOvVZKqkr7/CMxNqDZ3CQ2QH+Y="; + hash = "sha256-k8hUYA4/OzL2TB8s5DJpa2nFXV2U9eY09TLkqBDq9WE="; }; patches = [ (substituteAll { src = ./fix-paths.patch; - zenity = gnome.zenity; + inherit zenity; }) ]; diff --git a/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix b/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix index 7bf706f83b5f9..3f949c1fea5d4 100644 --- a/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix +++ b/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix @@ -7,7 +7,7 @@ , glib , gtk3 , nemo -, gnome +, file-roller , cinnamon-translations }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/nemo-fileroller.c \ - --replace "file-roller" "${lib.getExe gnome.file-roller}" \ + --replace "file-roller" "${lib.getExe file-roller}" \ --replace "GNOMELOCALEDIR" "${cinnamon-translations}/share/locale" ''; diff --git a/pkgs/desktops/cinnamon/nemo-extensions/srcs.nix b/pkgs/desktops/cinnamon/nemo-extensions/srcs.nix index a5ab9dfe9b3ec..3629b84b4a593 100644 --- a/pkgs/desktops/cinnamon/nemo-extensions/srcs.nix +++ b/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.1"; + version = "6.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = "nemo-extensions"; rev = version; - sha256 = "sha256-zuE0SO5VJ2kKjK7JgsSf+wJgfyffTHhfICslEoPKK8Q="; + sha256 = "sha256-qghGgd+OWYiXvcGUfgiQT6rR4mJPAOfOtYB3lWLg4iA="; }; } diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index fbc12c13dce01..20c067b44ab54 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -1,4 +1,5 @@ { fetchFromGitHub +, fetchpatch , glib , gobject-introspection , meson @@ -13,6 +14,8 @@ , cinnamon-desktop , xapp , libexif +, json-glib +, gtk-layer-shell , exempi , intltool , shared-mime-info @@ -22,19 +25,26 @@ stdenv.mkDerivation rec { pname = "nemo"; - version = "6.0.2"; + version = "6.2.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-vSLFp0sgqGsZtcXdv82PVH0HcBbmcxrMySLFCBrLJpA="; + sha256 = "sha256-afK+iJ/WUtcs8Upid4AkbAZAIs/wimHFlXm717U0LHc="; }; patches = [ # Load extensions from NEMO_EXTENSION_DIR environment variable # https://github.com/NixOS/nixpkgs/issues/78327 ./load-extensions-from-env.patch + + # Don't tie the interactive search box with the window's lifetime + # https://github.com/linuxmint/nemo/issues/3423 + (fetchpatch { + url = "https://github.com/linuxmint/nemo/commit/055b47af0e1a830e556989372f3689bbd36b639d.patch"; + hash = "sha256-cMtBz1uLGCV4nnrBITzXAV/SffI0nNcEdeujrHxAzQc="; + }) ]; outputs = [ "out" "dev" ]; @@ -49,6 +59,8 @@ stdenv.mkDerivation rec { exempi gvfs libgsf + json-glib + gtk-layer-shell ]; nativeBuildInputs = [ @@ -64,6 +76,8 @@ stdenv.mkDerivation rec { mesonFlags = [ # use locales from cinnamon-translations "--localedir=${cinnamon-translations}/share/locale" + # enabled by default in Mint packaging (see debian/rules) + "-Dgtk_layer_shell=true" ]; postInstall = '' |