diff options
Diffstat (limited to 'pkgs/desktops/cinnamon')
18 files changed, 91 insertions, 73 deletions
diff --git a/pkgs/desktops/cinnamon/bulky/default.nix b/pkgs/desktops/cinnamon/bulky/default.nix index 21cd43601924c..587018695d59b 100644 --- a/pkgs/desktops/cinnamon/bulky/default.nix +++ b/pkgs/desktops/cinnamon/bulky/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchFromGitHub -, wrapGAppsHook +, wrapGAppsHook3 , python3 , gobject-introspection , gsettings-desktop-schemas @@ -13,17 +13,17 @@ stdenv.mkDerivation rec { pname = "bulky"; - version = "3.2"; + version = "3.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = "bulky"; rev = version; - hash = "sha256-Zt5J8+CYiPxp/e1wDaJp7R91vYJmGNqPQs39J/OIwiQ="; + hash = "sha256-S4wAcwlJnXHYQEnP9WApCTjvVHKMrAt7gQ2l8zvFrs0="; }; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 gsettings-desktop-schemas gettext gobject-introspection diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 957739980746e..35a7a2247f5a1 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -9,6 +9,7 @@ , cjs , evolution-data-server , fetchFromGitHub +, fetchpatch , gdk-pixbuf , gettext , libgnomekbd @@ -29,7 +30,7 @@ , polkit , lib , stdenv -, wrapGAppsHook +, wrapGAppsHook3 , libxml2 , gtk-doc , gnome @@ -83,6 +84,13 @@ stdenv.mkDerivation rec { 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 = [ @@ -132,7 +140,7 @@ stdenv.mkDerivation rec { gobject-introspection meson ninja - wrapGAppsHook + wrapGAppsHook3 intltool gtk-doc perl @@ -140,13 +148,6 @@ stdenv.mkDerivation rec { pkg-config ]; - # Use locales from cinnamon-translations. - # FIXME: Upstream does not respect localedir option from Meson currently. - # https://github.com/linuxmint/cinnamon/pull/11244#issuecomment-1305855783 - postInstall = '' - ln -s ${cinnamon-translations}/share/locale $out/share/locale - ''; - postPatch = '' find . -type f -exec sed -i \ -e s,/usr/share/cinnamon,$out/share/cinnamon,g \ @@ -173,6 +174,22 @@ stdenv.mkDerivation rec { patchShebangs src/data-to-c.pl ''; + 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 = '' # https://github.com/NixOS/nixpkgs/issues/101881 gappsWrapperArgs+=( @@ -197,7 +214,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/linuxmint/cinnamon"; - description = "The Cinnamon desktop environment"; + description = "Cinnamon desktop environment"; license = [ licenses.gpl2 ]; platforms = platforms.linux; maintainers = teams.cinnamon.members; diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index e0aee4bde6403..55ca24d57de0e 100644 --- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -9,7 +9,6 @@ , gtk3 , libnotify , libxml2 -, gnome-online-accounts , colord , polkit , libxkbfile @@ -20,7 +19,7 @@ , libgudev , libwacom , gnome -, wrapGAppsHook +, wrapGAppsHook3 , tzdata , glibc , libnma @@ -59,7 +58,6 @@ stdenv.mkDerivation rec { colord libgudev libwacom - gnome-online-accounts tzdata networkmanager libnma @@ -85,20 +83,22 @@ 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 = [ pkg-config meson ninja - wrapGAppsHook + wrapGAppsHook3 gettext python3 ]; meta = with lib; { homepage = "https://github.com/linuxmint/cinnamon-control-center"; - description = "A collection of configuration plugins used in cinnamon-settings"; + description = "Collection of configuration plugins used in cinnamon-settings"; mainProgram = "cinnamon-control-center"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix index 0f53fbbb656a6..830abafa28538 100644 --- a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix @@ -13,7 +13,7 @@ , systemd , xkeyboard_config , xorg -, wrapGAppsHook +, wrapGAppsHook3 , glib }: @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meson ninja python3 - wrapGAppsHook + wrapGAppsHook3 intltool pkg-config gobject-introspection diff --git a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix index 754a5c43a182e..e184e64a889e9 100644 --- a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix @@ -6,7 +6,7 @@ , pkg-config , lib , stdenv -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - wrapGAppsHook + wrapGAppsHook3 pkg-config gobject-introspection ]; meta = with lib; { homepage = "https://github.com/linuxmint/cinnamon-menus"; - description = "A menu system for the Cinnamon project"; + description = "Menu system for the Cinnamon project"; license = [ licenses.gpl2 licenses.lgpl2 ]; platforms = platforms.linux; maintainers = teams.cinnamon.members; diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index 98d1a4f39c166..f08a242d4665c 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -15,7 +15,7 @@ , libgnomekbd , gnome , libtool -, wrapGAppsHook +, wrapGAppsHook3 , gobject-introspection , python3 , pam @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - wrapGAppsHook + wrapGAppsHook3 gettext intltool dbus # for meson.build @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/linuxmint/cinnamon-screensaver"; - description = "The Cinnamon screen locker and screensaver program"; + description = "Cinnamon screen locker and screensaver program"; license = [ licenses.gpl2 licenses.lgpl2 ]; platforms = platforms.linux; maintainers = teams.cinnamon.members; diff --git a/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/pkgs/desktops/cinnamon/cinnamon-session/default.nix index 66044ccefc4fc..47cedfa0a6f5c 100644 --- a/pkgs/desktops/cinnamon/cinnamon-session/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-session/default.nix @@ -16,7 +16,7 @@ , lib , stdenv , systemd -, wrapGAppsHook +, wrapGAppsHook3 , xapp , xorg , libexecinfo @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - wrapGAppsHook + wrapGAppsHook3 libexecinfo python3 pkg-config @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/linuxmint/cinnamon-session"; - description = "The Cinnamon session manager"; + description = "Cinnamon session manager"; license = licenses.gpl2; platforms = platforms.linux; maintainers = teams.cinnamon.members; diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix index 65828b3da6040..115ffcdece190 100644 --- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix @@ -10,7 +10,7 @@ , libgnomekbd , libnotify , libxklavier -, wrapGAppsHook +, wrapGAppsHook3 , pkg-config , lib , stdenv @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - wrapGAppsHook + wrapGAppsHook3 pkg-config ]; @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/linuxmint/cinnamon-settings-daemon"; - description = "The settings daemon for the Cinnamon desktop"; + description = "Settings daemon for the Cinnamon desktop"; license = licenses.gpl2; platforms = platforms.linux; maintainers = teams.cinnamon.members; diff --git a/pkgs/desktops/cinnamon/mint-artwork/default.nix b/pkgs/desktops/cinnamon/mint-artwork/default.nix index 7641272b0ec86..ef2c6ec4fa2c4 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.0"; + version = "1.8.2"; src = fetchurl { urls = [ "http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" - "https://web.archive.org/web/20240122135036/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" ]; - hash = "sha256-eCrch5IQdTd92DIqdjZFzvE4oShv3HuXfrLLUmLb0Ms="; + hash = "sha256-MegMFrnU8Gcc2v5y3BQCIZS31JdpfSM5FIJJNcyt4LY="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/mint-x-icons/default.nix b/pkgs/desktops/cinnamon/mint-x-icons/default.nix index 50819783db57f..8b045980c44a1 100644 --- a/pkgs/desktops/cinnamon/mint-x-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-x-icons/default.nix @@ -11,13 +11,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-x-icons"; - version = "1.6.8"; + version = "1.6.9"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-cxBZsAcGgoIY9KhjR/BWnMcttrywN6qap4lu5b2hauo="; + hash = "sha256-J5Osy+VosyBhwiiwELMtjDTf3/J6DpuQ4c9DO06fo+4="; }; propagatedBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/pkgs/desktops/cinnamon/mint-y-icons/default.nix index 3ac2792546cf5..f12800e384b43 100644 --- a/pkgs/desktops/cinnamon/mint-y-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-y-icons/default.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-y-icons"; - version = "1.7.5"; + version = "1.7.6"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-ZStRvT0qP8W1RCSJoXZHMrECp6k8dh/18UvgmV87oNQ="; + hash = "sha256-baBacAatUP/jtU/SEVRa6HceGooMwI9N9arDWqPHR2Y="; }; propagatedBuildInputs = [ @@ -45,7 +45,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { homepage = "https://github.com/linuxmint/mint-y-icons"; - description = "The Mint-Y icon theme"; + description = "Mint-Y icon theme"; license = licenses.gpl3; # from debian/copyright platforms = platforms.linux; maintainers = teams.cinnamon.members; diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix index f00a92ddc6d48..08a9d3bf91b6b 100644 --- a/pkgs/desktops/cinnamon/muffin/default.nix +++ b/pkgs/desktops/cinnamon/muffin/default.nix @@ -33,7 +33,7 @@ , udev , wayland , wayland-protocols -, wrapGAppsHook +, wrapGAppsHook3 , xorgserver , xwayland }: @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 xorgserver # for cvt command gobject-introspection ]; @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/linuxmint/muffin"; - description = "The window management library for the Cinnamon desktop (libmuffin) and its sample WM binary (muffin)"; + description = "Window management library for the Cinnamon desktop (libmuffin) and its sample WM binary (muffin)"; mainProgram = "muffin"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index fe61e9701d9c0..fbc12c13dce01 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -1,5 +1,4 @@ { fetchFromGitHub -, fetchpatch , glib , gobject-introspection , meson @@ -7,7 +6,7 @@ , pkg-config , lib , stdenv -, wrapGAppsHook +, wrapGAppsHook3 , libxml2 , gtk3 , gvfs @@ -56,7 +55,7 @@ stdenv.mkDerivation rec { meson pkg-config ninja - wrapGAppsHook + wrapGAppsHook3 intltool shared-mime-info gobject-introspection diff --git a/pkgs/desktops/cinnamon/pix/default.nix b/pkgs/desktops/cinnamon/pix/default.nix index 1264ca82fc8bd..8d74bdbe7122e 100644 --- a/pkgs/desktops/cinnamon/pix/default.nix +++ b/pkgs/desktops/cinnamon/pix/default.nix @@ -7,6 +7,7 @@ , exiv2 , libheif , libjpeg +, libjxl , libtiff , gst_all_1 , libraw @@ -20,7 +21,7 @@ , bison , flex , clutter-gtk -, wrapGAppsHook +, wrapGAppsHook3 , shared-mime-info , python3 , desktop-file-utils @@ -30,13 +31,13 @@ stdenv.mkDerivation rec { pname = "pix"; - version = "3.2.2"; + version = "3.4.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-tRndJjUw/k5mJPFTBMfW88Mvp2wZtC3RUzyS8bBO1jc="; + sha256 = "sha256-QkgjUzoBOXE3mxXy/Lq3YkHq7f9oE97FeP7PHIBDHvc="; }; nativeBuildInputs = [ @@ -48,7 +49,7 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -65,6 +66,7 @@ stdenv.mkDerivation rec { lcms2 libheif libjpeg + libjxl libraw librsvg libsecret @@ -92,7 +94,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A generic image viewer from Linux Mint"; + description = "Generic image viewer from Linux Mint"; mainProgram = "pix"; homepage = "https://github.com/linuxmint/pix"; license = licenses.gpl2Only; diff --git a/pkgs/desktops/cinnamon/warpinator/default.nix b/pkgs/desktops/cinnamon/warpinator/default.nix index 69a5aadb6ca9c..3968a87c13898 100644 --- a/pkgs/desktops/cinnamon/warpinator/default.nix +++ b/pkgs/desktops/cinnamon/warpinator/default.nix @@ -8,7 +8,7 @@ , gtk3 , gdk-pixbuf , xapp -, wrapGAppsHook +, wrapGAppsHook3 , gettext , polkit , glib @@ -36,20 +36,20 @@ let in stdenv.mkDerivation rec { pname = "warpinator"; - version = "1.8.3"; + version = "1.8.5"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-qtz8/vO6LJ19NcuFf9p3DWNy41kkoBWlgZGChlnTOvI="; + hash = "sha256-PODQvdi4CARHOyDG0dal6ge8icyFnvJXOdhqEcbcrAk="; }; nativeBuildInputs = [ meson ninja gobject-introspection - wrapGAppsHook + wrapGAppsHook3 gettext polkit # for its gettext ]; @@ -78,9 +78,9 @@ stdenv.mkDerivation rec { # We make bubblewrap mode always available since # landlock mode is not supported in old kernels. substituteInPlace src/warpinator-launch.py \ - --replace '"/bin/python3"' '"${pythonEnv.interpreter}"' \ - --replace "/bin/bwrap" "${bubblewrap}/bin/bwrap" \ - --replace 'GLib.find_program_in_path("bwrap")' "True" + --replace-fail '"/usr/bin/python3"' '"${pythonEnv.interpreter}"' \ + --replace-fail "/usr/bin/bwrap" "${bubblewrap}/bin/bwrap" \ + --replace-fail 'GLib.find_program_in_path("bwrap")' "True" ''; passthru.updateScript = gitUpdater { diff --git a/pkgs/desktops/cinnamon/xapp/default.nix b/pkgs/desktops/cinnamon/xapp/default.nix index 5c691cd40905a..d6f4536eef8b3 100644 --- a/pkgs/desktops/cinnamon/xapp/default.nix +++ b/pkgs/desktops/cinnamon/xapp/default.nix @@ -13,7 +13,7 @@ , lib , stdenv , vala -, wrapGAppsHook +, wrapGAppsHook3 , inxi , mate , dbus @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { pname = "xapp"; - version = "2.8.2"; + version = "2.8.4"; outputs = [ "out" "dev" ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-n600mc8/4+bYUtYaHUnmr90ThVkngcu8Ft02iuSrWWQ="; + hash = "sha256-Q82UI2GEv2g01pcrvn8JBOf9FgjbG0c1qfSINx0CouQ="; }; # Recommended by upstream, which enables the build of xapp-debug. @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/pkgs/desktops/cinnamon/xreader/default.nix b/pkgs/desktops/cinnamon/xreader/default.nix index c64f57ec3c8ee..94386d42815fc 100644 --- a/pkgs/desktops/cinnamon/xreader/default.nix +++ b/pkgs/desktops/cinnamon/xreader/default.nix @@ -6,7 +6,7 @@ , intltool , shared-mime-info , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , libarchive , libxml2 , xapp @@ -27,18 +27,18 @@ stdenv.mkDerivation rec { pname = "xreader"; - version = "4.0.2"; + version = "4.2.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-X5XMkO2JFceLyH7KEp8mnDltdjGpCT4kVGdcpGRpUJI="; + sha256 = "sha256-+q0fZA72m5T5ZB6bYWPWdQGxLpwjNp5Vak2TzaGwGWQ="; }; nativeBuildInputs = [ shared-mime-info - wrapGAppsHook + wrapGAppsHook3 meson ninja pkg-config @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A document viewer capable of displaying multiple and single page + description = "Document viewer capable of displaying multiple and single page document formats like PDF and Postscript"; homepage = "https://github.com/linuxmint/xreader"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/cinnamon/xviewer/default.nix b/pkgs/desktops/cinnamon/xviewer/default.nix index 47e4e331da8bd..5f45ed4f6bfa3 100644 --- a/pkgs/desktops/cinnamon/xviewer/default.nix +++ b/pkgs/desktops/cinnamon/xviewer/default.nix @@ -20,20 +20,20 @@ , ninja , pkg-config , python3 -, wrapGAppsHook +, wrapGAppsHook3 , xapp , yelp-tools }: stdenv.mkDerivation rec { pname = "xviewer"; - version = "3.4.4"; + version = "3.4.5"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-Kr3GoroQUzOePJiYeJYE9wrqWKcfX7ncu3tZSxOdnvU="; + sha256 = "sha256-J6KDkGPbcRBofsJVmd+1IEapSfSd3ftjz0AggvBI8ck="; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 yelp-tools ]; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A generic image viewer from Linux Mint"; + description = "Generic image viewer from Linux Mint"; mainProgram = "xviewer"; homepage = "https://github.com/linuxmint/xviewer"; license = licenses.gpl2Only; |