summary refs log tree commit diff
path: root/pkgs/build-support/make-desktopitem/default.nix
diff options
context:
space:
mode:
authorOrivej Desh <orivej@gmx.fr>2020-03-31 04:04:02 +0000
committerOrivej Desh <orivej@gmx.fr>2020-03-31 04:10:58 +0000
commit7df81361e48167ed5e8de12dac5969ae4670732d (patch)
tree5ea59c36c41cd5c55a35e9df89bf9b035b2dbcc2 /pkgs/build-support/make-desktopitem/default.nix
parentd5f9b0199dbe420c700f7757be007ac529494886 (diff)
downloadnixpkgs-7df81361e48167ed5e8de12dac5969ae4670732d.tar
nixpkgs-7df81361e48167ed5e8de12dac5969ae4670732d.tar.gz
nixpkgs-7df81361e48167ed5e8de12dac5969ae4670732d.tar.bz2
nixpkgs-7df81361e48167ed5e8de12dac5969ae4670732d.tar.lz
nixpkgs-7df81361e48167ed5e8de12dac5969ae4670732d.tar.xz
nixpkgs-7df81361e48167ed5e8de12dac5969ae4670732d.tar.zst
nixpkgs-7df81361e48167ed5e8de12dac5969ae4670732d.zip
makeDesktopItem: make categories optional
"Application" is deprecated, "Other" is invalid, there are no generic
categories, and the Categories fields is optional per the spec.

Fixes the defaults after #75729.
Diffstat (limited to 'pkgs/build-support/make-desktopitem/default.nix')
-rw-r--r--pkgs/build-support/make-desktopitem/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/build-support/make-desktopitem/default.nix
index 127243c6f2f..8355a5ad29b 100644
--- a/pkgs/build-support/make-desktopitem/default.nix
+++ b/pkgs/build-support/make-desktopitem/default.nix
@@ -9,7 +9,7 @@
 , desktopName
 , genericName ? null
 , mimeType ? null
-, categories ? "Application;Other;"
+, categories ? null
 , startupNotify ? null
 , extraEntries ? null
 , fileValidation ? true # whether to validate resulting desktop file.
@@ -20,6 +20,7 @@ let
                          {k="Comment";       v=comment;}
                          {k="GenericName";   v=genericName;}
                          {k="MimeType";      v=mimeType;}
+                         {k="Categories";    v=categories;}
                          {k="StartupNotify"; v=startupNotify;}];
 
   valueNotNull = {k, v}: v != null;
@@ -37,7 +38,6 @@ runCommandLocal "${name}.desktop" {}
     Exec=${exec}
     Terminal=${terminal}
     Name=${desktopName}
-    Categories=${categories}
     ${optionalEntriesString}
     ${if extraEntries == null then ''EOF'' else ''
     ${extraEntries}