From 18429f1d1d185afe04e81df89344e9ce47945589 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 22 Oct 2020 21:52:22 +0200
Subject: [PATCH] emacs: remove use of makeDesktopItem

Can generate the file directly to avoid the dependency on the
`makeDesktopItem` API.
---
 modules/services/emacs.nix                    | 36 +++++++++----------
 .../services/emacs/emacs-emacsclient.desktop  | 17 +++++----
 2 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/modules/services/emacs.nix b/modules/services/emacs.nix
index a73b750c..7910861f 100644
--- a/modules/services/emacs.nix
+++ b/modules/services/emacs.nix
@@ -10,24 +10,24 @@ let
   emacsVersion = getVersion emacsCfg.finalPackage;
 
   # Adapted from upstream emacs.desktop
-  clientDesktopItem = pkgs.makeDesktopItem rec {
-    name = "emacsclient";
-    desktopName = "Emacs Client";
-    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 = "${emacsBinPath}/emacsclient ${
-        concatStringsSep " " cfg.client.arguments
-      } %F";
-    icon = "emacs";
-    type = "Application";
-    terminal = "false";
-    categories = "Utility;TextEditor;";
-    extraEntries = ''
-      StartupWMClass=Emacs
-    '';
-  };
+  clientDesktopItem = pkgs.writeTextDir "share/applications/emacsclient.desktop"
+    (generators.toINI { } {
+      "Desktop Entry" = {
+        Type = "Application";
+        Exec = "${emacsBinPath}/emacsclient ${
+            concatStringsSep " " cfg.client.arguments
+          } %F";
+        Terminal = false;
+        Name = "Emacs Client";
+        Icon = "emacs";
+        Comment = "Edit text";
+        GenericName = "Text Editor";
+        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++;";
+        Categories = "Utility;TextEditor;";
+        StartupWMClass = "Emacs";
+      };
+    });
 
   # Match the default socket path for the Emacs version so emacsclient continues
   # to work without wrapping it. It might be worthwhile to allow customizing the
diff --git a/tests/modules/services/emacs/emacs-emacsclient.desktop b/tests/modules/services/emacs/emacs-emacsclient.desktop
index ab9849bb..1dafb4e0 100644
--- a/tests/modules/services/emacs/emacs-emacsclient.desktop
+++ b/tests/modules/services/emacs/emacs-emacsclient.desktop
@@ -1,12 +1,11 @@
 [Desktop Entry]
-Type=Application
-Exec=@emacs@/bin/emacsclient -c %F
-Terminal=false
-Name=Emacs Client
-Icon=emacs
-Comment=Edit text
-GenericName=Text Editor
-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++;
 Categories=Utility;TextEditor;
+Comment=Edit text
+Exec=@emacs@/bin/emacsclient -c %F
+GenericName=Text Editor
+Icon=emacs
+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++;
+Name=Emacs Client
 StartupWMClass=Emacs
-
+Terminal=false
+Type=Application