Unverified Commit ef4edf25 authored by Bobby Rong's avatar Bobby Rong Committed by GitHub
Browse files

Cinnamon updates 2025-08-06 (#431487)

parents d00a33c9 2c551ea2
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ in

  config = mkMerge [
    (mkIf cfg.enable {
      services.displayManager.sessionPackages = [ pkgs.cinnamon-common ];
      services.displayManager.sessionPackages = [ pkgs.cinnamon ];

      services.xserver.displayManager.lightdm.greeters.slick = {
        enable = mkDefault true;
@@ -114,7 +114,7 @@ in
      services.accounts-daemon.enable = true;
      services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
      services.dbus.packages = with pkgs; [
        cinnamon-common
        cinnamon
        cinnamon-screensaver
        nemo-with-extensions
        xapp
@@ -166,7 +166,7 @@ in
            desktop-file-utils

            # common-files
            cinnamon-common
            cinnamon
            cinnamon-session
            cinnamon-desktop
            cinnamon-menus
@@ -177,7 +177,7 @@ in

            # session requirements
            cinnamon-screensaver
            # cinnamon-killer-daemon: provided by cinnamon-common
            # cinnamon-killer-daemon: provided by cinnamon
            networkmanagerapplet # session requirement - also nm-applet not needed

            # packages
@@ -225,7 +225,7 @@ in

      services.orca.enable = mkDefault (notExcluded pkgs.orca);

      xdg.portal.configPackages = mkDefault [ pkgs.cinnamon-common ];
      xdg.portal.configPackages = mkDefault [ pkgs.cinnamon ];

      # Override GSettings schemas
      environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@
  gnome-themes-extra,
  gtk-engine-murrine,
  inkscape,
  cinnamon-common,
  cinnamon,
  makeFontsConf,
  python3,
}:
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
  mesonFlags = [
    # "-Dthemes=cinnamon,gnome-shell,gtk2,gtk3,plank,xfwm,metacity"
    # "-Dvariants=light,darker,dark,lighter"
    "-Dcinnamon_version=${cinnamon-common.version}"
    "-Dcinnamon_version=${cinnamon.version}"
    "-Dgnome_shell_version=${gnome-shell.version}"
    # You will need to patch gdm to make use of this.
    "-Dgnome_shell_gresource=true"
+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
  postPatch = ''
    chmod +x install-scripts/meson_install_schemas.py # patchShebangs requires executable file
    patchShebangs install-scripts/meson_install_schemas.py
    sed "s|/usr/share|/run/current-system/sw/share|g" -i ./schemas/* # NOTE: unless this causes a circular dependency, we could link it to cinnamon-common/share/cinnamon
    sed "s|/usr/share|/run/current-system/sw/share|g" -i ./schemas/* # NOTE: unless this causes a circular dependency, we could link it to cinnamon/share/cinnamon
  '';

  meta = with lib; {
+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@
  cinnamon-desktop,
  cinnamon-session,
  cinnamon-settings-daemon,
  cinnamon-common,
  cinnamon,
  bulky,
}:

@@ -35,7 +35,7 @@ let
    cinnamon-desktop
    cinnamon-session
    cinnamon-settings-daemon
    cinnamon-common
    cinnamon
    gnome-terminal
    gsettings-desktop-schemas
    gtk3
+4 −4
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@
  dbus,
  gettext,
  cinnamon-desktop,
  cinnamon-common,
  cinnamon,
  intltool,
  libxslt,
  gtk3,
@@ -29,13 +29,13 @@

stdenv.mkDerivation rec {
  pname = "cinnamon-screensaver";
  version = "6.4.0";
  version = "6.4.1";

  src = fetchFromGitHub {
    owner = "linuxmint";
    repo = "cinnamon-screensaver";
    rev = version;
    hash = "sha256-XlEu/aBwNeu+CC6IRnFTF6LUnb7VY2+OOGsdCvQYweA=";
    hash = "sha256-CK4WP5IafNII81e8HxUNN3Vp36Ln78Xvv5lIMvL+nbk=";
  };

  patches = [
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
    pam
    cairo
    cinnamon-desktop
    cinnamon-common
    cinnamon
    libgnomekbd
    caribou
  ];
Loading