Unverified Commit 247c97b6 authored by adisbladis's avatar adisbladis Committed by GitHub
Browse files

Merge pull request #35896 from wucke13/master

Solving #30396
parents bd4ad008 9580f221
Loading
Loading
Loading
Loading
+20 −1
Original line number Diff line number Diff line
@@ -15,6 +15,25 @@ let
    fi
  '';

desktopApplicationFile = pkgs.writeTextFile {
  name = "emacsclient.desktop";
  destination = "/share/applications/emacsclient.desktop";
  text = ''
[Desktop Entry]
Name=Emacsclient
GenericName=Text Editor
Comment=Edit text
MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
Exec=emacseditor %F
Icon=emacs
Type=Application
Terminal=false
Categories=Development;TextEditor;
StartupWMClass=Emacs
Keywords=Text;Editor;
'';
};

in {

  options.services.emacs = {
@@ -74,7 +93,7 @@ in {
      };
    } // optionalAttrs cfg.enable { wantedBy = [ "default.target" ]; };

    environment.systemPackages = [ cfg.package editorScript ];
    environment.systemPackages = [ cfg.package editorScript desktopApplicationFile ];

    environment.variables = {
      # This is required so that GTK applications launched from Emacs