treewide: fix desktopItems (#345778)

NixOS · Oct 5, 2024 · 1c52242 · 1c52242
2 parents 35b3400 + 94ceb85
commit 1c52242
Show file tree

Hide file tree

Showing 10 changed files with 118 additions and 98 deletions.
diff --git a/pkgs/applications/audio/galaxy-buds-client/default.nix b/pkgs/applications/audio/galaxy-buds-client/default.nix
@@ -44,17 +44,19 @@ buildDotnetModule rec {
     gm convert $src/GalaxyBudsClient/Resources/icon_white.ico $out/share/icons/hicolor/256x256/apps/${meta.mainProgram}.png
   '';
 
-  desktopItems = makeDesktopItem {
-    name = meta.mainProgram;
-    exec = meta.mainProgram;
-    icon = meta.mainProgram;
-    desktopName = meta.mainProgram;
-    genericName = "Galaxy Buds Client";
-    comment = meta.description;
-    type = "Application";
-    categories = [ "Settings" ];
-    startupNotify = true;
-  };
+  desktopItems = [
+    (makeDesktopItem {
+      name = meta.mainProgram;
+      exec = meta.mainProgram;
+      icon = meta.mainProgram;
+      desktopName = meta.mainProgram;
+      genericName = "Galaxy Buds Client";
+      comment = meta.description;
+      type = "Application";
+      categories = [ "Settings" ];
+      startupNotify = true;
+    })
+  ];
 
   meta = with lib; {
     mainProgram = "GalaxyBudsClient";

diff --git a/pkgs/applications/misc/conduktor/default.nix b/pkgs/applications/misc/conduktor/default.nix
@@ -11,18 +11,20 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ makeWrapper copyDesktopItems ];
 
-  desktopItems = makeDesktopItem {
-    type = "Application";
-    name = pname;
-    desktopName = "Conduktor";
-    genericName = meta.description;
-    exec = pname;
-    icon = fetchurl {
-      url = "https://github.com/conduktor/builds/raw/v${version}/.github/resources/Conduktor.png";
-      sha256 = "0s7p74qclvac8xj2m22gfxx5m2c7cf0nqpk5sb049p2wvryhn2j4";
-    };
-    comment = "A beautiful and fully-featured desktop client for Apache Kafka";
-  };
+  desktopItems = [
+    (makeDesktopItem {
+      type = "Application";
+      name = pname;
+      desktopName = "Conduktor";
+      genericName = meta.description;
+      exec = pname;
+      icon = fetchurl {
+        url = "https://github.com/conduktor/builds/raw/v${version}/.github/resources/Conduktor.png";
+        sha256 = "0s7p74qclvac8xj2m22gfxx5m2c7cf0nqpk5sb049p2wvryhn2j4";
+      };
+      comment = "A beautiful and fully-featured desktop client for Apache Kafka";
+    })
+  ];
 
   dontConfigure = true;
   dontBuild = true;

diff --git a/pkgs/applications/science/robotics/inav-configurator/default.nix b/pkgs/applications/science/robotics/inav-configurator/default.nix
@@ -33,14 +33,16 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  desktopItems = makeDesktopItem {
-    name = pname;
-    exec = pname;
-    icon = pname;
-    comment = "iNavFlight configuration tool";
-    desktopName = "iNav Configurator";
-    genericName = "Flight controller configuration tool";
-  };
+  desktopItems = [
+    (makeDesktopItem {
+      name = pname;
+      exec = pname;
+      icon = pname;
+      comment = "iNavFlight configuration tool";
+      desktopName = "iNav Configurator";
+      genericName = "Flight controller configuration tool";
+    })
+  ];
 
   meta = with lib; {
     description = "INav flight control system configuration tool";

diff --git a/pkgs/by-name/en/ente-auth/package.nix b/pkgs/by-name/en/ente-auth/package.nix
@@ -59,21 +59,23 @@ flutter324.buildFlutterApplication rec {
 
   # Based on https://github.com/ente-io/ente/blob/main/auth/linux/packaging/rpm/make_config.yaml
   # and https://github.com/ente-io/ente/blob/main/auth/linux/packaging/ente_auth.appdata.xml
-  desktopItems = makeDesktopItem {
-    name = "ente_auth";
-    exec = "ente_auth";
-    icon = "ente-auth";
-    desktopName = "Ente Auth";
-    genericName = "Ente Authentication";
-    comment = "Open source 2FA authenticator, with end-to-end encrypted backups";
-    categories = [ "Utility" ];
-    keywords = [
-      "Authentication"
-      "2FA"
-    ];
-    mimeTypes = [ "x-scheme-handler/enteauth" ];
-    startupNotify = false;
-  };
+  desktopItems = [
+    (makeDesktopItem {
+      name = "ente_auth";
+      exec = "ente_auth";
+      icon = "ente-auth";
+      desktopName = "Ente Auth";
+      genericName = "Ente Authentication";
+      comment = "Open source 2FA authenticator, with end-to-end encrypted backups";
+      categories = [ "Utility" ];
+      keywords = [
+        "Authentication"
+        "2FA"
+      ];
+      mimeTypes = [ "x-scheme-handler/enteauth" ];
+      startupNotify = false;
+    })
+  ];
 
   postInstall = ''
     FAV=$out/app/data/flutter_assets/assets/icons/auth-icon.png

diff --git a/pkgs/development/coq-modules/coqide/default.nix b/pkgs/development/coq-modules/coqide/default.nix
@@ -43,14 +43,16 @@ mkCoqDerivation rec {
     runHook postInstall
   '';
 
-  desktopItems = makeDesktopItem {
-    name = "coqide";
-    exec = "coqide";
-    icon = "coq";
-    desktopName = "CoqIDE";
-    comment = "Graphical interface for the Coq proof assistant";
-    categories = [ "Development" "Science" "Math" "IDE" "GTK" ];
-  };
+  desktopItems = [
+    (makeDesktopItem {
+      name = "coqide";
+      exec = "coqide";
+      icon = "coq";
+      desktopName = "CoqIDE";
+      comment = "Graphical interface for the Coq proof assistant";
+      categories = [ "Development" "Science" "Math" "IDE" "GTK" ];
+    })
+  ];
 
   meta = with lib; {
     homepage = "https://coq.inria.fr";

diff --git a/pkgs/development/tools/java/jprofiler/default.nix b/pkgs/development/tools/java/jprofiler/default.nix
@@ -39,15 +39,17 @@ let
     hash = "sha256-4T0j2ctHmgWOSCmFG2PZCLJS57nIa5MxmJBpMYzy9FI=";
   };
 
-  desktopItems = makeDesktopItem {
-    name = pname;
-    exec = pname;
-    icon = pname;
-    comment = meta.description;
-    desktopName = nameApp;
-    genericName = "Java Profiler Tool";
-    categories = [ "Development" ];
-  };
+  desktopItems = [
+    (makeDesktopItem {
+      name = pname;
+      exec = pname;
+      icon = pname;
+      comment = meta.description;
+      desktopName = nameApp;
+      genericName = "Java Profiler Tool";
+      categories = [ "Development" ];
+    })
+  ];
 
   linux = stdenv.mkDerivation {
     inherit pname version src desktopItems;

diff --git a/pkgs/games/gnubg/default.nix b/pkgs/games/gnubg/default.nix
@@ -18,15 +18,17 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-gtk" "--with--board3d" ];
 
-  desktopItems = makeDesktopItem {
-    desktopName = "GNU Backgammon";
-    name = pname;
-    genericName = "Backgammon";
-    comment = meta.description;
-    exec = pname;
-    icon = pname;
-    categories = [ "Game" "GTK" "StrategyGame" ];
-  };
+  desktopItems = [
+    (makeDesktopItem {
+      desktopName = "GNU Backgammon";
+      name = pname;
+      genericName = "Backgammon";
+      comment = meta.description;
+      exec = pname;
+      icon = pname;
+      categories = [ "Game" "GTK" "StrategyGame" ];
+    })
+  ];
 
   meta = with lib;
     { description = "World class backgammon application";

diff --git a/pkgs/games/vintagestory/default.nix b/pkgs/games/vintagestory/default.nix
@@ -48,14 +48,16 @@ stdenv.mkDerivation rec {
     libXi
   ]));
 
-  desktopItems = makeDesktopItem {
-    name = "vintagestory";
-    desktopName = "Vintage Story";
-    exec = "vintagestory";
-    icon = "vintagestory";
-    comment = "Innovate and explore in a sandbox world";
-    categories = [ "Game" ];
-  };
+  desktopItems = [
+    (makeDesktopItem {
+      name = "vintagestory";
+      desktopName = "Vintage Story";
+      exec = "vintagestory";
+      icon = "vintagestory";
+      comment = "Innovate and explore in a sandbox world";
+      categories = [ "Game" ];
+    })
+  ];
 
   installPhase = ''
     runHook preInstall

diff --git a/pkgs/tools/misc/gaphor/default.nix b/pkgs/tools/misc/gaphor/default.nix
@@ -51,13 +51,15 @@ buildPythonApplication rec {
     tinycss2
   ];
 
-  desktopItems = makeDesktopItem {
-    name = pname;
-    exec = "gaphor";
-    icon = "gaphor";
-    comment = meta.description;
-    desktopName = "Gaphor";
-  };
+  desktopItems = [
+    (makeDesktopItem {
+      name = pname;
+      exec = "gaphor";
+      icon = "gaphor";
+      comment = meta.description;
+      desktopName = "Gaphor";
+    })
+  ];
 
   # Disable automatic wrapGAppsHook3 to prevent double wrapping
   dontWrapGApps = true;

diff --git a/pkgs/tools/networking/mqttmultimeter/default.nix b/pkgs/tools/networking/mqttmultimeter/default.nix
@@ -42,17 +42,19 @@ buildDotnetModule rec {
     libglvnd
   ];
 
-  desktopItems = makeDesktopItem {
-    name = meta.mainProgram;
-    exec = meta.mainProgram;
-    icon = meta.mainProgram;
-    desktopName = meta.mainProgram;
-    genericName = meta.description;
-    comment = meta.description;
-    type = "Application";
-    categories = [ "Network" ];
-    startupNotify = true;
-  };
+  desktopItems = [
+    (makeDesktopItem {
+      name = meta.mainProgram;
+      exec = meta.mainProgram;
+      icon = meta.mainProgram;
+      desktopName = meta.mainProgram;
+      genericName = meta.description;
+      comment = meta.description;
+      type = "Application";
+      categories = [ "Network" ];
+      startupNotify = true;
+    })
+  ];
 
   meta = with lib; {
     mainProgram = builtins.head executables;