From 20f07b4aa90974a569b313e889c6d21df6612415 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sat, 20 Jan 2024 08:07:06 +0800 Subject: nixos/emacs: drop custom emacsclient desktop file This custom emacsclient desktop file was added[1] to Nixpkgs when the upstream did not provide one. Since an emacsclient desktop file is provided[2] by the upstream now, we should remove our custom one from Nixpkgs to reduce maintenance burden[3]. Fixes https://github.com/NixOS/nixpkgs/issues/245533 [1]: https://github.com/NixOS/nixpkgs/pull/35896 [2]: https://git.savannah.gnu.org/cgit/emacs.git/commit/etc/emacsclient.desktop?id=1a845a672dc73c8e98e6cb9bb734616e168e60ba [3]: https://git.savannah.gnu.org/cgit/emacs.git/commit/etc/emacsclient.desktop?id=1500e4b4329d4d3d0141263230d74e1b314373b1 --- nixos/modules/services/editors/emacs.nix | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'nixos') diff --git a/nixos/modules/services/editors/emacs.nix b/nixos/modules/services/editors/emacs.nix index 6f45be6640bc6..ff6fd85d8a9b7 100644 --- a/nixos/modules/services/editors/emacs.nix +++ b/nixos/modules/services/editors/emacs.nix @@ -15,25 +15,6 @@ 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 { @@ -102,7 +83,7 @@ in wantedBy = if cfg.startWithGraphical then [ "graphical-session.target" ] else [ "default.target" ]; }; - environment.systemPackages = [ cfg.package editorScript desktopApplicationFile ]; + environment.systemPackages = [ cfg.package editorScript ]; environment.variables.EDITOR = mkIf cfg.defaultEditor (mkOverride 900 "emacseditor"); }; -- cgit 1.4.1