From 7df81361e48167ed5e8de12dac5969ae4670732d Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 31 Mar 2020 04:04:02 +0000 Subject: [PATCH] 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. --- pkgs/build-support/make-desktopitem/default.nix | 4 ++-- 1 file 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}