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

Merge pull request #213561 from bobby285271/fix/cinnamon 

cinnamon.cinnamon-common: various changes
parents 670f5fd1 6997aefc

nixos/modules/services/x11/desktop-managers/cinnamon.nix

+2 −1
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ in 
        xapp

      ];

      services.cinnamon.apps.enable = mkDefault true;

      services.gnome.evolution-data-server.enable = true;

      services.gnome.glib-networking.enable = true;

      services.gnome.gnome-keyring.enable = true;

      services.gvfs.enable = true;
@@ -214,7 +215,6 @@ in 
      programs.geary.enable = mkDefault true;

      programs.gnome-disks.enable = mkDefault true;

      programs.gnome-terminal.enable = mkDefault true;

      programs.evince.enable = mkDefault true;

      programs.file-roller.enable = mkDefault true;



      environment.systemPackages = with pkgs // pkgs.gnome // pkgs.cinnamon; utils.removePackagesByName [
@@ -232,6 +232,7 @@ in 
        # external apps shipped with linux-mint

        hexchat

        gnome-calculator

        gnome-calendar

        gnome-screenshot

      ] config.environment.cinnamon.excludePackages;

    })

pkgs/desktops/cinnamon/cinnamon-common/default.nix

+24 −18
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
, cinnamon-session

, cinnamon-translations

, cjs

, clutter

, evolution-data-server

, fetchFromGitHub

, gdk-pixbuf

, gettext
@@ -23,6 +23,7 @@ 
, libstartup_notification

, libXtst

, libXdamage

, mesa

, muffin

, networkmanager

, pkg-config
@@ -52,6 +53,23 @@ 
, perl

}:



let

  pythonEnv = python3.withPackages (pp: with pp; [

    dbus-python

    setproctitle

    pygobject3

    pycairo

    pp.xapp # don't omit `pp.`, see #213561

    pillow

    pyinotify # for looking-glass

    pytz

    tinycss2

    python-pam

    pexpect

    distro

    requests

  ]);

in

stdenv.mkDerivation rec {

  pname = "cinnamon-common";

  version = "5.6.7";
@@ -69,28 +87,14 @@ stdenv.mkDerivation rec { 
  ];



  buildInputs = [

    (python3.withPackages (pp: with pp; [

      dbus-python

      setproctitle

      pygobject3

      pycairo

      python3.pkgs.xapp # The scope prefix is required

      pillow

      pytz

      tinycss2

      python-pam

      pexpect

      distro

      requests

    ]))

    atk

    cacert

    cinnamon-control-center

    cinnamon-desktop

    cinnamon-menus

    cjs

    clutter

    dbus

    evolution-data-server # for calendar-server

    gdk-pixbuf

    glib

    gsound
@@ -100,9 +104,11 @@ stdenv.mkDerivation rec { 
    libstartup_notification

    libXtst

    libXdamage

    mesa

    muffin

    networkmanager

    polkit

    pythonEnv

    libxml2

    libgnomekbd

    gst_all_1.gstreamer
@@ -151,9 +157,9 @@ stdenv.mkDerivation rec { 


    sed "s|/usr/share/sounds|/run/current-system/sw/share/sounds|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py



    sed "s|/usr/share/%s|/run/current-system/sw/share/%s|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_themes.py

    sed "s|'python3'|'${pythonEnv.interpreter}'|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/CinnamonGtkSettings.py



    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/share/%s|/run/current-system/sw/share/%s|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_themes.py



    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