movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 12:45:27 +03:00
Code Issues Projects Releases Packages Wiki Activity

treewide: switch all desktop file generators to new API

Browse source 
Notably:
- remove explicit arguments that match the defaults
- convert everything to the right Nix types
This commit is contained in:
K900 2022-02-22 17:56:15 +03:00 • committed by Jonathan Ringer
parent 0c713dbed4
commit cb2cfba6f7
241 changed files with 463 additions and 504 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/misc/documentation.nix
View file

@ -129,7 +129,7 @@ let
genericName = "View NixOS documentation in a web browser"; genericName = "View NixOS documentation in a web browser";
icon = "nix-snowflake"; icon = "nix-snowflake";
exec = "nixos-help"; exec = "nixos-help";
categories = "System"; categories = ["System"];
}; };
in pkgs.symlinkJoin { in pkgs.symlinkJoin {

19
nixos/modules/programs/phosh.nix
View file

@ -8,18 +8,17 @@ let
# Based on https://source.puri.sm/Librem5/librem5-base/-/blob/4596c1056dd75ac7f043aede07887990fd46f572/default/sm.puri.OSK0.desktop # Based on https://source.puri.sm/Librem5/librem5-base/-/blob/4596c1056dd75ac7f043aede07887990fd46f572/default/sm.puri.OSK0.desktop
oskItem = pkgs.makeDesktopItem { oskItem = pkgs.makeDesktopItem {
name = "sm.puri.OSK0"; name = "sm.puri.OSK0";
type = "Application";
desktopName = "On-screen keyboard"; desktopName = "On-screen keyboard";
exec = "${pkgs.squeekboard}/bin/squeekboard"; exec = "${pkgs.squeekboard}/bin/squeekboard";
categories = "GNOME;Core;"; categories = [ "GNOME" "Core" ];
extraEntries = '' onlyShowIn = [ "GNOME" ];
OnlyShowIn=GNOME; noDisplay = true;
NoDisplay=true extraConfig = {
X-GNOME-Autostart-Phase=Panel X-GNOME-Autostart-Phase = "Panel";
X-GNOME-Provides=inputmethod X-GNOME-Provides = "inputmethod";
X-GNOME-Autostart-Notify=true X-GNOME-Autostart-Notify = "true";
X-GNOME-AutoRestart=true X-GNOME-AutoRestart = "true";
''; };
}; };
phocConfigType = types.submodule { phocConfigType = types.submodule {

5
pkgs/applications/audio/goattracker/default.nix
View file

@ -12,7 +12,6 @@ with lib;
let let
pname = "goattracker" + optionalString isStereo "-stereo"; pname = "goattracker" + optionalString isStereo "-stereo";
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
type = "Application";
name = pname; name = pname;
desktopName = "GoatTracker 2" + optionalString isStereo " Stereo"; desktopName = "GoatTracker 2" + optionalString isStereo " Stereo";
genericName = "Music Tracker"; genericName = "Music Tracker";
@ -20,8 +19,8 @@ let
then "gt2stereo" then "gt2stereo"
else "goattrk2"; else "goattrk2";
icon = "goattracker"; icon = "goattracker";
categories = "AudioVideo;AudioVideoEditing;"; categories = [ "AudioVideo" "AudioVideoEditing" ];
extraEntries = "Keywords=tracker;music;"; keywords = [ "tracker" "music" ];
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {

10
pkgs/applications/audio/jamesdsp/default.nix
View file

@ -38,19 +38,15 @@ mkDerivation rec{
desktopItems = [ desktopItems = [
(makeDesktopItem { (makeDesktopItem {
name = "jamesdsp.desktop"; name = "jamesdsp";
desktopName = "JamesDSP"; desktopName = "JamesDSP";
genericName = "Audio effects processor"; genericName = "Audio effects processor";
exec = "jamesdsp"; exec = "jamesdsp";
icon = "jamesdsp"; icon = "jamesdsp";
comment = "JamesDSP for Linux"; comment = "JamesDSP for Linux";
categories = "AudioVideo;Audio"; categories = [ "AudioVideo" "Audio" ];
startupNotify = false; startupNotify = false;
terminal = false; keywords = [ "equalizer" "audio" "effect" ];
type = "Application";
extraDesktopEntries = {
Keywords = "equalizer;audio;effect";
};
}) })
]; ];

2
pkgs/applications/audio/lyrebird/default.nix
View file

@ -15,7 +15,7 @@ let
icon = "${placeholder "out"}/share/lyrebird/icon.png"; icon = "${placeholder "out"}/share/lyrebird/icon.png";
desktopName = "Lyrebird"; desktopName = "Lyrebird";
genericName = "Voice Changer"; genericName = "Voice Changer";
categories = "AudioVideo;Audio;"; categories = [ "AudioVideo" "Audio" ];
}; };
in in
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {

1
pkgs/applications/audio/netease-cloud-music-gtk/default.nix
View file

@ -11,7 +11,6 @@
, wrapGAppsHook , wrapGAppsHook
, fetchurl , fetchurl
, fetchFromGitHub , fetchFromGitHub
, makeDesktopItem
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "netease-cloud-music-gtk"; pname = "netease-cloud-music-gtk";

2
pkgs/applications/audio/roomeqwizard/default.nix
View file

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
icon = pname; icon = pname;
desktopName = "REW"; desktopName = "REW";
genericName = "Software for audio measurements"; genericName = "Software for audio measurements";
categories = "AudioVideo;"; categories = [ "AudioVideo" ];
}; };
responseFile = writeTextFile { responseFile = writeTextFile {

2
pkgs/applications/audio/sony-headphones-client/default.nix
View file

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
icon = "SonyHeadphonesClient"; icon = "SonyHeadphonesClient";
desktopName = "Sony Headphones Client"; desktopName = "Sony Headphones Client";
comment = "A client recreating the functionality of the Sony Headphones app"; comment = "A client recreating the functionality of the Sony Headphones app";
categories = "Audio;Mixer;"; categories = [ "Audio" "Mixer" ];
}) ]; }) ];
meta = with lib; { meta = with lib; {

2
pkgs/applications/blockchains/bisq-desktop/default.nix
View file

@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
icon = "bisq"; icon = "bisq";
desktopName = "Bisq ${version}"; desktopName = "Bisq ${version}";
genericName = "Decentralized bitcoin exchange"; genericName = "Decentralized bitcoin exchange";
categories = "Network;P2P;"; categories = [ "Network" "P2P" ];
}) })
]; ];

2
pkgs/applications/blockchains/crypto-org-wallet/default.nix
View file

@ -1,4 +1,4 @@
{ lib, fetchurl, makeDesktopItem, appimageTools, imagemagick }: { lib, fetchurl, appimageTools, imagemagick }:
let let
pname = "chain-desktop-wallet"; pname = "chain-desktop-wallet";

2
pkgs/applications/blockchains/monero-gui/default.nix
View file

@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
icon = "monero"; icon = "monero";
desktopName = "Monero"; desktopName = "Monero";
genericName = "Wallet"; genericName = "Wallet";
categories = "Network;Utility;"; categories = [ "Network" "Utility" ];
}; };
postInstall = '' postInstall = ''

2
pkgs/applications/blockchains/mycrypto/default.nix
View file

@ -23,7 +23,7 @@ let
comment = "MyCrypto is a free, open-source interface for interacting with the blockchain"; comment = "MyCrypto is a free, open-source interface for interacting with the blockchain";
exec = pname; exec = pname;
icon = "mycrypto"; icon = "mycrypto";
categories = "Finance;"; categories = [ "Finance" ];
}; };
in appimageTools.wrapType2 rec { in appimageTools.wrapType2 rec {

2
pkgs/applications/blockchains/wasabiwallet/default.nix
View file

@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
desktopName = "Wasabi"; desktopName = "Wasabi";
genericName = "Bitcoin wallet"; genericName = "Bitcoin wallet";
comment = meta.description; comment = meta.description;
categories = "Network;Utility;"; categories = [ "Network" "Utility" ];
}; };
installPhase = '' installPhase = ''

6
pkgs/applications/editors/android-studio/common.nix
View file

@ -164,9 +164,9 @@ let
icon = drvName; icon = drvName;
desktopName = "Android Studio (${channel} channel)"; desktopName = "Android Studio (${channel} channel)";
comment = "The official Android IDE"; comment = "The official Android IDE";
categories = "Development;IDE;"; categories = [ "Development" "IDE" ];
startupNotify = "true"; startupNotify = true;
extraEntries="StartupWMClass=jetbrains-studio"; startupWMClass = "jetbrains-studio";
}; };
# Android Studio downloads prebuilt binaries as part of the SDK. These tools # Android Studio downloads prebuilt binaries as part of the SDK. These tools

2
pkgs/applications/editors/eclipse/build-eclipse.nix
View file

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
comment = "Integrated Development Environment"; comment = "Integrated Development Environment";
desktopName = "Eclipse IDE"; desktopName = "Eclipse IDE";
genericName = "Integrated Development Environment"; genericName = "Integrated Development Environment";
categories = "Development;"; categories = [ "Development" ];
}; };
buildInputs = [ buildInputs = [

6
pkgs/applications/editors/jetbrains/common.nix
View file

@ -27,11 +27,9 @@ with stdenv; lib.makeOverridable mkDerivation (rec {
comment = lib.replaceChars ["\n"] [" "] meta.longDescription; comment = lib.replaceChars ["\n"] [" "] meta.longDescription;
desktopName = product; desktopName = product;
genericName = meta.description; genericName = meta.description;
categories = "Development;"; categories = [ "Development" ];
icon = mainProgram; icon = mainProgram;
extraEntries = '' startupWMClass = wmClass;
StartupWMClass=${wmClass}
'';
}; };
vmoptsFile = optionalString (vmopts != null) (writeText vmoptsName vmopts); vmoptsFile = optionalString (vmopts != null) (writeText vmoptsName vmopts);

2
pkgs/applications/editors/kodestudio/default.nix
View file

@ -39,7 +39,7 @@ in
comment = "Kode Studio is an IDE for Kha based on Visual Studio Code"; comment = "Kode Studio is an IDE for Kha based on Visual Studio Code";
desktopName = "Kode Studio"; desktopName = "Kode Studio";
genericName = "Text Editor"; genericName = "Text Editor";
categories = "GNOME;GTK;Utility;TextEditor;Development;"; categories = [ "GNOME" "GTK" "Utility" "TextEditor" "Development" ];
}; };
sourceRoot = "."; sourceRoot = ".";

8
pkgs/applications/editors/leo-editor/default.nix
View file

@ -24,11 +24,9 @@ mkDerivation rec {
comment = meta.description; comment = meta.description;
desktopName = "Leo"; desktopName = "Leo";
genericName = "Text Editor"; genericName = "Text Editor";
categories = lib.concatStringsSep ";" [ categories = [ "Application" "Development" "IDE" ];
"Application" "Development" "IDE" startupNotify = false;
]; mimeTypes = [
startupNotify = "false";
mimeType = lib.concatStringsSep ";" [
"text/plain" "text/asp" "text/x-c" "text/x-script.elisp" "text/x-fortran" "text/plain" "text/asp" "text/x-c" "text/x-script.elisp" "text/x-fortran"
"text/html" "application/inf" "text/x-java-source" "application/x-javascript" "text/html" "application/inf" "text/x-java-source" "application/x-javascript"
"application/javascript" "text/ecmascript" "application/x-ksh" "text/x-script.ksh" "application/javascript" "text/ecmascript" "application/x-ksh" "text/x-script.ksh"

2
pkgs/applications/editors/netbeans/default.nix
View file

@ -10,7 +10,7 @@ let
comment = "Integrated Development Environment"; comment = "Integrated Development Environment";
desktopName = "Apache NetBeans IDE"; desktopName = "Apache NetBeans IDE";
genericName = "Integrated Development Environment"; genericName = "Integrated Development Environment";
categories = "Development;"; categories = [ "Development" ];
icon = "netbeans"; icon = "netbeans";
}; };
in in

2
pkgs/applications/editors/quartus-prime/default.nix
View file

@ -10,7 +10,7 @@ let
icon = "quartus"; icon = "quartus";
desktopName = "Quartus"; desktopName = "Quartus";
genericName = "Quartus Prime"; genericName = "Quartus Prime";
categories = "Development;"; categories = [ "Development" ];
}; };
# I think modelsim_ase/linux/vlm checksums itself, so use FHSUserEnv instead of `patchelf` # I think modelsim_ase/linux/vlm checksums itself, so use FHSUserEnv instead of `patchelf`
in buildFHSUserEnv rec { in buildFHSUserEnv rec {

9
pkgs/applications/editors/rstudio/default.nix
View file

@ -227,8 +227,13 @@ in
desktopName = "RStudio"; desktopName = "RStudio";
genericName = "IDE"; genericName = "IDE";
comment = description; comment = description;
categories = "Development;"; categories = [ "Development" ];
mimeType = "text/x-r-source;text/x-r;text/x-R;text/x-r-doc;text/x-r-sweave;text/x-r-markdown;text/x-r-html;text/x-r-presentation;application/x-r-data;application/x-r-project;text/x-r-history;text/x-r-profile;text/x-tex;text/x-markdown;text/html;text/css;text/javascript;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;"; mimeTypes = [
"text/x-r-source" "text/x-r" "text/x-R" "text/x-r-doc" "text/x-r-sweave" "text/x-r-markdown"
"text/x-r-html" "text/x-r-presentation" "application/x-r-data" "application/x-r-project"
"text/x-r-history" "text/x-r-profile" "text/x-tex" "text/x-markdown" "text/html"
"text/css" "text/javascript" "text/x-chdr" "text/x-csrc" "text/x-c++hdr" "text/x-c++src"
];
}) })
]; ];
}) })

2
pkgs/applications/editors/sublime/2/default.nix
View file

@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
comment = meta.description; comment = meta.description;
desktopName = "Sublime Text"; desktopName = "Sublime Text";
genericName = "Text Editor"; genericName = "Text Editor";
categories = "TextEditor;Development;"; categories = [ "TextEditor" "Development" ];
icon = "sublime_text"; icon = "sublime_text";
}; };

2
pkgs/applications/editors/thonny/default.nix
View file

@ -21,7 +21,7 @@ buildPythonApplication rec {
icon = "thonny"; icon = "thonny";
desktopName = "Thonny"; desktopName = "Thonny";
comment = "Python IDE for beginners"; comment = "Python IDE for beginners";
categories = "Development;IDE"; categories = [ "Development" "IDE" ];
}) ]; }) ];
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [

12
pkgs/applications/editors/vis/default.nix
View file

@ -50,14 +50,10 @@ stdenv.mkDerivation rec {
comment = meta.description; comment = meta.description;
desktopName = "vis"; desktopName = "vis";
genericName = "Text editor"; genericName = "Text editor";
categories = lib.concatStringsSep ";" [ categories = [ "Application" "Development" "IDE" ];
"Application" "Development" "IDE" mimeTypes = [ "text/plain" "application/octet-stream" ];
]; startupNotify = false;
mimeType = lib.concatStringsSep ";" [ terminal = true;
"text/plain" "application/octet-stream"
];
startupNotify = "false";
terminal = "true";
}; };
meta = with lib; { meta = with lib; {

35
pkgs/applications/editors/vscode/generic.nix
View file

@ -37,19 +37,16 @@ let
genericName = "Text Editor"; genericName = "Text Editor";
exec = "${executableName} %F"; exec = "${executableName} %F";
icon = "code"; icon = "code";
startupNotify = "true"; startupNotify = true;
categories = "Utility;TextEditor;Development;IDE;"; startupWMClass = shortName;
mimeType = "text/plain;inode/directory;"; categories = [ "Utility" "TextEditor" "Development" "IDE" ];
extraEntries = '' mimeTypes = [ "text/plain" "inode/directory" ];
StartupWMClass=${shortName} keywords = [ "vscode" ];
Actions=new-empty-window; actions.new-empty-window = {
Keywords=vscode; name = "New Empty Window";
exec = "${executableName} --new-window %F";
[Desktop Action new-empty-window] icon = "code";
Name=New Empty Window };
Exec=${executableName} --new-window %F
Icon=code
'';
}; };
urlHandlerDesktopItem = makeDesktopItem { urlHandlerDesktopItem = makeDesktopItem {
@ -59,13 +56,11 @@ let
genericName = "Text Editor"; genericName = "Text Editor";
exec = executableName + " --open-url %U"; exec = executableName + " --open-url %U";
icon = "code"; icon = "code";
startupNotify = "true"; startupNotify = true;
categories = "Utility;TextEditor;Development;IDE;"; categories = [ "Utility" "TextEditor" "Development" "IDE" ];
mimeType = "x-scheme-handler/vscode;"; mimeTypes = [ "x-scheme-handler/vscode" ];
extraEntries = '' keywords = [ "vscode" ];
NoDisplay=true noDisplay = true;
Keywords=vscode;
'';
}; };
buildInputs = [ libsecret libXScrnSaver libxshmfence ] buildInputs = [ libsecret libXScrnSaver libxshmfence ]

2
pkgs/applications/editors/xxe-pe/default.nix
View file

@ -19,7 +19,7 @@ let
icon = "xxe"; icon = "xxe";
desktopName = "xxe"; desktopName = "xxe";
genericName = "XML Editor"; genericName = "XML Editor";
categories = "Development;IDE;TextEditor;Java"; categories = [ "Development" "IDE" "TextEditor" "Java" ];
}; };
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

2
pkgs/applications/emulators/ccemux/default.nix
View file

@ -29,7 +29,7 @@ let
comment = "A modular ComputerCraft emulator"; comment = "A modular ComputerCraft emulator";
desktopName = "CCEmuX"; desktopName = "CCEmuX";
genericName = "ComputerCraft Emulator"; genericName = "ComputerCraft Emulator";
categories = "Emulator;"; categories = [ "Emulator" ];
}; };
in in

2
pkgs/applications/emulators/dosbox-staging/default.nix
View file

@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
comment = "x86 dos emulator enhanced"; comment = "x86 dos emulator enhanced";
desktopName = "DosBox-Staging"; desktopName = "DosBox-Staging";
genericName = "DOS emulator"; genericName = "DOS emulator";
categories = "Emulator;Game;"; categories = [ "Emulator" "Game" ];
}) })
]; ];

2
pkgs/applications/emulators/dosbox/default.nix
View file

@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
comment = "x86 dos emulator"; comment = "x86 dos emulator";
desktopName = "DOSBox"; desktopName = "DOSBox";
genericName = "DOS emulator"; genericName = "DOS emulator";
categories = "Emulator;Game;"; categories = [ "Emulator" "Game" ];
}) })
]; ];

2
pkgs/applications/emulators/mame/default.nix
View file

@ -26,7 +26,7 @@ let
exec = "mame${lib.optionalString stdenv.is64bit "64"}"; exec = "mame${lib.optionalString stdenv.is64bit "64"}";
desktopName = "MAME"; desktopName = "MAME";
genericName = "MAME is a multi-purpose emulation framework"; genericName = "MAME is a multi-purpose emulation framework";
categories = "System;Emulator;"; categories = [ "System" "Emulator" ];
}; };
dest = "$out/opt/mame"; dest = "$out/opt/mame";

4
pkgs/applications/emulators/mgba/default.nix
View file

@ -57,8 +57,8 @@ stdenv.mkDerivation rec {
comment = "A Game Boy Advance Emulator"; comment = "A Game Boy Advance Emulator";
desktopName = "mgba"; desktopName = "mgba";
genericName = "Game Boy Advance Emulator"; genericName = "Game Boy Advance Emulator";
categories = "Game;Emulator;"; categories = [ "Game" "Emulator" ];
startupNotify = "false"; startupNotify = false;
}) })
]; ];

2
pkgs/applications/emulators/ryujinx/default.nix
View file

@ -74,7 +74,7 @@ buildDotnetModule rec {
icon = "ryujinx"; icon = "ryujinx";
comment = meta.description; comment = meta.description;
type = "Application"; type = "Application";
categories = "Game;"; categories = [ "Game" ];
})]; })];
meta = with lib; { meta = with lib; {

2
pkgs/applications/emulators/vice/default.nix
View file

@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
comment = "Commodore 64 emulator"; comment = "Commodore 64 emulator";
desktopName = "VICE"; desktopName = "VICE";
genericName = "Commodore 64 emulator"; genericName = "Commodore 64 emulator";
categories = "Emulator;"; categories = [ "Emulator" ];
}; };
preBuild = '' preBuild = ''

2
pkgs/applications/emulators/zsnes/default.nix
View file

@ -9,7 +9,7 @@ let
comment = "A SNES emulator"; comment = "A SNES emulator";
desktopName = "zsnes"; desktopName = "zsnes";
genericName = "zsnes"; genericName = "zsnes";
categories = "Game;"; categories = [ "Game" ];
}; };
in stdenv.mkDerivation { in stdenv.mkDerivation {

10
pkgs/applications/graphics/antimony/default.nix
View file

@ -48,13 +48,9 @@ in
genericName = "CAD Application"; genericName = "CAD Application";
exec = "antimony %f"; exec = "antimony %f";
icon = "antimony"; icon = "antimony";
terminal = "false"; categories = [ "Graphics" "Science" "Engineering" ];
categories = "Graphics;Science;Engineering"; mimeTypes = [ "application/x-extension-sb" "application/x-antimony" ];
mimeType = "application/x-extension-sb;application/x-antimony;"; startupWMClass = "antimony";
extraEntries = ''
StartupWMClass=antimony
Version=1.0
'';
}) })
]; ];

2
pkgs/applications/graphics/avocode/default.nix
View file

@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
icon = "avocode"; icon = "avocode";
desktopName = "Avocode"; desktopName = "Avocode";
genericName = "Design Inspector"; genericName = "Design Inspector";
categories = "Development;"; categories = [ "Development" ];
comment = "The bridge between designers and developers"; comment = "The bridge between designers and developers";
}; };

4
pkgs/applications/graphics/evilpixie/default.nix
View file

@ -16,8 +16,8 @@ let
exec = "evilpixie %F"; exec = "evilpixie %F";
icon = "evilpixie"; icon = "evilpixie";
genericName = "Image Editor"; genericName = "Image Editor";
categories = "Graphics;2DGraphics;RasterGraphics;"; categories = [ "Graphics" "2DGraphics" "RasterGraphics" ];
mimeType = "image/bmp;image/gif;image/jpeg;image/jpg;image/png;image/x-pcx;image/x-targa;image/x-tga;"; mimeTypes = [ "image/bmp" "image/gif" "image/jpeg" "image/jpg" "image/png" "image/x-pcx" "image/x-targa" "image/x-tga" ];
}; };
in mkDerivation rec { in mkDerivation rec {

13
pkgs/applications/graphics/fiji/default.nix
View file

@ -26,20 +26,15 @@ stdenv.mkDerivation rec {
(makeDesktopItem { (makeDesktopItem {
name = "fiji"; name = "fiji";
exec = "fiji %F"; exec = "fiji %F";
tryExec = "fiji";
icon = "fiji"; icon = "fiji";
mimeType = "image/*;"; mimeTypes = [ "image/*" ];
comment = "Scientific Image Analysis"; comment = "Scientific Image Analysis";
desktopName = "Fiji Is Just ImageJ"; desktopName = "Fiji Is Just ImageJ";
genericName = "Fiji Is Just ImageJ"; genericName = "Fiji Is Just ImageJ";
categories = "Education;Science;ImageProcessing;"; categories = [ "Education" "Science" "ImageProcessing" ];
terminal = false;
startupNotify = true; startupNotify = true;
extraEntries = '' startupWMClass = "fiji-Main";
Version=1.0
TryExec=fiji
X-GNOME-FullName=Fiji Is Just ImageJ
StartupWMClass=fiji-Main
'';
}) })
]; ];

2
pkgs/applications/graphics/imagej/default.nix
View file

@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
name = "ImageJ"; name = "ImageJ";
desktopName = "ImageJ"; desktopName = "ImageJ";
icon = "imagej"; icon = "imagej";
categories = "Science;Utility;Graphics;"; categories = [ "Science" "Utility" "Graphics" ];
exec = "imagej"; exec = "imagej";
}) })
]; ];

10
pkgs/applications/graphics/ipe/default.nix
View file

@ -60,12 +60,10 @@ mkDerivation rec {
comment = "A drawing editor for creating figures in PDF format"; comment = "A drawing editor for creating figures in PDF format";
exec = "ipe"; exec = "ipe";
icon = "ipe"; icon = "ipe";
mimeType = "text/xml;application/pdf"; mimeTypes = [ "text/xml" "application/pdf" ];
categories = "Graphics;Qt;"; categories = [ "Graphics" "Qt" ];
extraDesktopEntries = { startupNotify = true;
StartupWMClass = "ipe"; startupWMClass = "ipe";
StartupNotify = "true";
};
}) })
]; ];

4
pkgs/applications/graphics/openboard/default.nix
View file

@ -79,8 +79,8 @@ in mkDerivation rec {
icon = "OpenBoard"; icon = "OpenBoard";
comment = "OpenBoard, an interactive white board application"; comment = "OpenBoard, an interactive white board application";
desktopName = "OpenBoard"; desktopName = "OpenBoard";
mimeType = "application/ubz"; mimeTypes = [ "application/ubz" ];
categories = "Education;"; categories = [ "Education" ];
startupNotify = true; startupNotify = true;
}) })
]; ];

2
pkgs/applications/graphics/swingsane/default.nix
View file

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
desktopName = "SwingSane"; desktopName = "SwingSane";
genericName = "Scan from local or remote SANE servers"; genericName = "Scan from local or remote SANE servers";
comment = meta.description; comment = meta.description;
categories = "Office;"; categories = [ "Office" ];
}; };
in '' in ''

2
pkgs/applications/graphics/write_stylus/default.nix
View file

@ -7,7 +7,7 @@ let
icon = "write_stylus"; icon = "write_stylus";
desktopName = "Write"; desktopName = "Write";
genericName = "Write"; genericName = "Write";
categories = "Office;Graphics"; categories = [ "Office" "Graphics" ];
}; };
in in
mkDerivation rec { mkDerivation rec {

4
pkgs/applications/graphics/xournal/default.nix
View file

@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
icon = "xournal"; icon = "xournal";
desktopName = "Xournal"; desktopName = "Xournal";
comment = meta.description; comment = meta.description;
categories = "Office;Graphics;"; categories = [ "Office" "Graphics" ];
mimeType = "application/pdf;application/x-xoj"; mimeTypes = [ "application/pdf" "application/x-xoj" ];
genericName = "PDF Editor"; genericName = "PDF Editor";
}; };

36
pkgs/applications/misc/azuredatastudio/default.nix
View file

@ -32,19 +32,16 @@ let
genericName = "Text Editor"; genericName = "Text Editor";
exec = "azuredatastudio --no-sandbox --unity-launch %F"; exec = "azuredatastudio --no-sandbox --unity-launch %F";
icon = "azuredatastudio"; icon = "azuredatastudio";
startupNotify = "true"; startupNotify = true;
categories = "Utility;TextEditor;Development;IDE;"; startupWMClass = "azuredatastudio";
mimeType = "text/plain;inode/directory;application/x-azuredatastudio-workspace;"; categories = [ "Utility" "TextEditor" "Development" "IDE" ];
extraEntries = '' mimeTypes = [ "text/plain" "inode/directory" "application/x-azuredatastudio-workspace" ];
StartupWMClass=azuredatastudio keywords = [ "azuredatastudio" ];
Actions=new-empty-window; actions.new-empty-window = {
Keywords=azuredatastudio; name = "New Empty Window";
exec = "azuredatastudio --no-sandbox --new-window %F";
[Desktop Action new-empty-window] icon = "azuredatastudio";
Name=New Empty Window };
Exec=azuredatastudio --no-sandbox --new-window %F
Icon=azuredatastudio
'';
}; };
urlHandlerDesktopItem = makeDesktopItem { urlHandlerDesktopItem = makeDesktopItem {
@ -54,13 +51,12 @@ let
genericName = "Text Editor"; genericName = "Text Editor";
exec = "azuredatastudio --no-sandbox --open-url %U"; exec = "azuredatastudio --no-sandbox --open-url %U";
icon = "azuredatastudio"; icon = "azuredatastudio";
startupNotify = "true"; startupNotify = true;
categories = "Utility;TextEditor;Development;IDE;"; startupWMClass = "azuredatastudio";
mimeType = "x-scheme-handler/azuredatastudio;"; categories = [ "Utility" "TextEditor" "Development" "IDE" ];
extraEntries = '' mimeTypes = [ "x-scheme-handler/azuredatastudio" ];
NoDisplay=true keywords = [ "azuredatastudio" ];
Keywords=azuredatastudio; noDisplay = true;
'';
}; };
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

2
pkgs/applications/misc/cubiomes-viewer/default.nix
View file

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
desktopName = "Cubiomes Viewer"; desktopName = "Cubiomes Viewer";
exec = pname; exec = pname;
icon = pname; icon = pname;
categories = "Game"; categories = [ "Game" ];
comment = meta.description; comment = meta.description;
}) ]; }) ];

2
pkgs/applications/misc/cura/stable.nix
View file

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
comment = "Cura"; comment = "Cura";
desktopName = "Cura"; desktopName = "Cura";
genericName = "3D printing host software"; genericName = "3D printing host software";
categories = "GNOME;GTK;Utility;"; categories = [ "GNOME" "GTK" "Utility" ];
}; };
python_deps = with python27Packages; [ pyopengl pyserial numpy wxPython30 power setuptools ]; python_deps = with python27Packages; [ pyopengl pyserial numpy wxPython30 power setuptools ];

2
pkgs/applications/misc/dbeaver/default.nix
View file

@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
desktopName = "dbeaver"; desktopName = "dbeaver";
comment = "SQL Integrated Development Environment"; comment = "SQL Integrated Development Environment";
genericName = "SQL Integrated Development Environment"; genericName = "SQL Integrated Development Environment";
categories = "Development;"; categories = [ "Development" ];
}) })
]; ];

6
pkgs/applications/misc/free42/default.nix
View file

@ -74,8 +74,7 @@ stdenv.mkDerivation rec {
exec = "free42bin"; exec = "free42bin";
type = "Application"; type = "Application";
comment = meta.description; comment = meta.description;
categories = "Utility;Calculator;"; categories = [ "Utility" "Calculator" ];
terminal = "false";
}) })
(makeDesktopItem { (makeDesktopItem {
name = "com.thomasokken.free42dec"; name = "com.thomasokken.free42dec";
@ -84,8 +83,7 @@ stdenv.mkDerivation rec {
exec = "free42dec"; exec = "free42dec";
type = "Application"; type = "Application";
comment = meta.description; comment = meta.description;
categories = "Utility;Calculator;"; categories = [ "Utility" "Calculator" ];
terminal = "false";
}) })
]; ];

2
pkgs/applications/misc/ganttproject-bin/default.nix
View file

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
desktopName = "GanttProject"; desktopName = "GanttProject";
genericName = "Shedule and manage projects"; genericName = "Shedule and manage projects";
comment = meta.description; comment = meta.description;
categories = "Office;"; categories = [ "Office" ];
}; };
javaOptions = [ javaOptions = [

2
pkgs/applications/misc/gkrellm/default.nix
View file

@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
desktopName = "GKrellM"; desktopName = "GKrellM";
genericName = "System monitor"; genericName = "System monitor";
comment = "The GNU Krell Monitors"; comment = "The GNU Krell Monitors";
categories = "System;Monitor;"; categories = [ "System" "Monitor" ];
}) })
]; ];

2
pkgs/applications/misc/golden-cheetah/default.nix
View file

@ -12,7 +12,7 @@ let
desktopName = "GoldenCheetah"; desktopName = "GoldenCheetah";
genericName = "GoldenCheetah"; genericName = "GoldenCheetah";
comment = "Performance software for cyclists, runners and triathletes"; comment = "Performance software for cyclists, runners and triathletes";
categories = "Utility;"; categories = [ "Utility" ];
}; };
in mkDerivation rec { in mkDerivation rec {
pname = "golden-cheetah"; pname = "golden-cheetah";

2
pkgs/applications/misc/gpsprune/default.nix
View file

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
desktopName = "GpsPrune"; desktopName = "GpsPrune";
genericName = "GPS Data Editor"; genericName = "GPS Data Editor";
comment = meta.description; comment = meta.description;
categories = "Education;Geoscience;"; categories = [ "Education" "Geoscience" ];
}) })
]; ];

4
pkgs/applications/misc/ideamaker/default.nix
View file

@ -63,8 +63,8 @@ stdenv.mkDerivation rec {
icon = pname; icon = pname;
desktopName = "Ideamaker"; desktopName = "Ideamaker";
genericName = meta.description; genericName = meta.description;
categories = "Utility;Viewer;Engineering;"; categories = [ "Utility" "Viewer" "Engineering" ];
mimeType = "application/sla"; mimeTypes = [ "application/sla" ];
}; };
meta = with lib; { meta = with lib; {

2
pkgs/applications/misc/ipmiview/default.nix
View file

@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
exec = "IPMIView"; exec = "IPMIView";
desktopName = name; desktopName = name;
genericName = "Supermicro BMC manager"; genericName = "Supermicro BMC manager";
categories = "Network"; categories = [ "Network" ];
}; };
installPhase = '' installPhase = ''

7
pkgs/applications/misc/keepass/default.nix
View file

@ -69,11 +69,8 @@ with builtins; buildDotnetPackage rec {
icon = "keepass"; icon = "keepass";
desktopName = "Keepass"; desktopName = "Keepass";
genericName = "Password manager"; genericName = "Password manager";
categories = "Utility;"; categories = [ "Utility" ];
mimeType = lib.concatStringsSep ";" [ mimeTypes = [ "application/x-keepass2" ];
"application/x-keepass2"
""
];
}; };
outputFiles = [ outputFiles = [

2
pkgs/applications/misc/lsd2dsl/default.nix
View file

@ -25,7 +25,7 @@ mkDerivation rec {
desktopName = "lsd2dsl"; desktopName = "lsd2dsl";
genericName = "lsd2dsl"; genericName = "lsd2dsl";
comment = meta.description; comment = meta.description;
categories = "Dictionary;FileTools;Qt;"; categories = [ "Dictionary" "FileTools" "Qt" ];
}); });
installPhase = '' installPhase = ''

1
pkgs/applications/misc/michabo/default.nix
View file

@ -10,7 +10,6 @@
let let
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
type = "Application";
name = "Michabo"; name = "Michabo";
desktopName = "Michabo"; desktopName = "Michabo";
exec = "Michabo"; exec = "Michabo";

2
pkgs/applications/misc/obinskit/default.nix
View file

@ -15,7 +15,7 @@ let
icon = "obinskit"; icon = "obinskit";
desktopName = "Obinskit"; desktopName = "Obinskit";
genericName = "Obinskit keyboard configurator"; genericName = "Obinskit keyboard configurator";
categories = "Utility"; categories = [ "Utility" ];
}; };
electron = electron_13; electron = electron_13;
in in

2
pkgs/applications/misc/obsidian/default.nix
View file

@ -15,7 +15,7 @@ let
comment = "Knowledge base"; comment = "Knowledge base";
icon = "obsidian"; icon = "obsidian";
exec = "obsidian"; exec = "obsidian";
categories = "Office"; categories = [ "Office" ];
}; };
updateScript = writeScript "obsidian-updater" '' updateScript = writeScript "obsidian-updater" ''

2
pkgs/applications/misc/opentrack/default.nix
View file

@ -45,7 +45,7 @@ in mkDerivation {
}; };
desktopName = name; desktopName = name;
genericName = "Head tracking software"; genericName = "Head tracking software";
categories = "Utility;"; categories = [ "Utility" ];
}) })
]; ];

4
pkgs/applications/misc/pdfsam-basic/default.nix
View file

@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
comment = meta.description; comment = meta.description;
desktopName = "PDFsam Basic"; desktopName = "PDFsam Basic";
genericName = "PDF Split and Merge"; genericName = "PDF Split and Merge";
mimeType = "application/pdf;"; mimeTypes = [ "application/pdf" ];
categories = "Office;"; categories = [ "Office" ];
}; };
meta = with lib; { meta = with lib; {

6
pkgs/applications/misc/pdfstudio/common.nix
View file

@ -40,10 +40,8 @@ let
exec = "${pname} %f"; exec = "${pname} %f";
icon = "${pname}${year}"; icon = "${pname}${year}";
comment = "Views and edits PDF files"; comment = "Views and edits PDF files";
mimeType = "application/pdf"; mimeTypes = [ "application/pdf" ];
categories = "Office"; categories = [ "Office" ];
type = "Application";
terminal = false;
}) })
]; ];

5
pkgs/applications/misc/pgadmin/default.nix
View file

@ -52,9 +52,8 @@ stdenv.mkDerivation rec {
genericName = "SQL Administration"; genericName = "SQL Administration";
exec = "pgadmin3"; exec = "pgadmin3";
icon = "pgAdmin3"; icon = "pgAdmin3";
type = "Application"; categories = [ "Development" ];
categories = "Development;"; mimeTypes = [ "text/html" ];
mimeType = "text/html";
}; };
in '' in ''
mkdir -p $out/share/pixmaps; mkdir -p $out/share/pixmaps;

2
pkgs/applications/misc/plater/default.nix
View file

@ -28,7 +28,7 @@ mkDerivation rec {
icon = pname; icon = pname;
desktopName = "Ideamaker"; desktopName = "Ideamaker";
genericName = meta.description; genericName = meta.description;
categories = "Utility;Engineering;"; categories = ["Utility" "Engineering"];
}; };
postInstall = '' postInstall = ''

2
pkgs/applications/misc/premid/default.nix
View file

@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
icon = pname; icon = pname;
desktopName = "PreMiD"; desktopName = "PreMiD";
genericName = meta.description; genericName = meta.description;
mimeType = "x-scheme-handler/premid"; mimeTypes = [ "x-scheme-handler/premid" ];
}) })
]; ];

4
pkgs/applications/misc/prusa-slicer/default.nix
View file

@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
comment = "G-code generator for 3D printers"; comment = "G-code generator for 3D printers";
desktopName = "PrusaSlicer"; desktopName = "PrusaSlicer";
genericName = "3D printer tool"; genericName = "3D printer tool";
categories = "Development;"; categories = [ "Development" ];
}) })
(makeDesktopItem { (makeDesktopItem {
name = "PrusaSlicer G-code Viewer"; name = "PrusaSlicer G-code Viewer";
@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
comment = "G-code viewer for 3D printers"; comment = "G-code viewer for 3D printers";
desktopName = "PrusaSlicer G-code Viewer"; desktopName = "PrusaSlicer G-code Viewer";
genericName = "G-code Viewer"; genericName = "G-code Viewer";
categories = "Development;"; categories = [ "Development" ];
}) })
]; ];

2
pkgs/applications/misc/prusa-slicer/super-slicer.nix
View file

@ -39,7 +39,7 @@ let
comment = description; comment = description;
desktopName = appname; desktopName = appname;
genericName = "3D printer tool"; genericName = "3D printer tool";
categories = "Development;"; categories = [ "Development" ];
}) })
]; ];

2
pkgs/applications/misc/robo3t/default.nix
View file

@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
comment = "Query GUI for mongodb"; comment = "Query GUI for mongodb";
desktopName = "Robo3T"; desktopName = "Robo3T";
genericName = "MongoDB management tool"; genericName = "MongoDB management tool";
categories = "Development;IDE;"; categories = [ "Development" "IDE" ];
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

2
pkgs/applications/misc/sidequest/default.nix
View file

@ -8,7 +8,7 @@
exec = "SideQuest"; exec = "SideQuest";
desktopName = name; desktopName = name;
genericName = "VR App Store"; genericName = "VR App Store";
categories = "Settings;PackageManager;"; categories = [ "Settings" "PackageManager" ];
}; };
sidequest = stdenv.mkDerivation { sidequest = stdenv.mkDerivation {

5
pkgs/applications/misc/simplenote/default.nix
View file

@ -46,14 +46,13 @@ let
}; };
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
categories = "Development"; categories = [ "Development" ];
comment = "Simplenote for Linux"; comment = "Simplenote for Linux";
desktopName = "Simplenote"; desktopName = "Simplenote";
exec = "simplenote %U"; exec = "simplenote %U";
icon = "simplenote"; icon = "simplenote";
name = "simplenote"; name = "simplenote";
startupNotify = "true"; startupNotify = true;
type = "Application";
}; };
dontBuild = true; dontBuild = true;

2
pkgs/applications/misc/slic3r/default.nix
View file

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
comment = "G-code generator for 3D printers"; comment = "G-code generator for 3D printers";
desktopName = "Slic3r"; desktopName = "Slic3r";
genericName = "3D printer tool"; genericName = "3D printer tool";
categories = "Development;"; categories = [ "Development" ];
}; };
prePatch = '' prePatch = ''

2
pkgs/applications/misc/snapmaker-luban/default.nix
View file

@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
icon = "snapmaker-luban"; icon = "snapmaker-luban";
desktopName = "Snapmaker Luban"; desktopName = "Snapmaker Luban";
genericName = meta.description; genericName = meta.description;
categories = "Office;Printing;"; categories = [ "Office" "Printing" ];
}) })
]; ];

2
pkgs/applications/misc/stretchly/default.nix
View file

@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
icon = icon; icon = icon;
desktopName = "Stretchly"; desktopName = "Stretchly";
genericName = "Stretchly"; genericName = "Stretchly";
categories = "Utility;"; categories = [ "Utility" ];
}; };
meta = with lib; { meta = with lib; {

2
pkgs/applications/misc/sweethome3d/default.nix
View file

@ -37,7 +37,7 @@ let
icon = pname; icon = pname;
comment = description; comment = description;
genericName = "Computer Aided (Interior) Design"; genericName = "Computer Aided (Interior) Design";
categories = "Graphics;2DGraphics;3DGraphics;"; categories = [ "Graphics" "2DGraphics" "3DGraphics" ];
}; };
postPatch = '' postPatch = ''

2
pkgs/applications/misc/sweethome3d/editors.nix
View file

@ -40,7 +40,7 @@ let
name = pname; name = pname;
comment = description; comment = description;
genericName = "Computer Aided (Interior) Design"; genericName = "Computer Aided (Interior) Design";
categories = "Graphics;2DGraphics;3DGraphics;"; categories = [ "Graphics" "2DGraphics" "3DGraphics" ];
}; };
nativeBuildInputs = [ makeWrapper unzip ]; nativeBuildInputs = [ makeWrapper unzip ];

1
pkgs/applications/misc/teleprompter/default.nix
View file

@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = "teleprompter"; name = "teleprompter";
exec = "teleprompter"; exec = "teleprompter";
type = "Application";
desktopName = "Teleprompter"; desktopName = "Teleprompter";
}; };

2
pkgs/applications/misc/toggldesktop/default.nix
View file

@ -133,7 +133,7 @@ let
''; '';
desktopItem = makeDesktopItem rec { desktopItem = makeDesktopItem rec {
categories = "Utility;"; categories = [ "Utility" ];
desktopName = "Toggl"; desktopName = "Toggl";
genericName = desktopName; genericName = desktopName;
name = "toggldesktop"; name = "toggldesktop";

2
pkgs/applications/misc/trenchbroom/default.nix
View file

@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
desktopName = "TrenchBroom level editor"; desktopName = "TrenchBroom level editor";
icon = "trenchbroom"; icon = "trenchbroom";
comment = meta.description; comment = meta.description;
categories = "Development"; categories = [ "Development" ];
exec = "trenchbroom"; exec = "trenchbroom";
}) })
]; ];

8
pkgs/applications/misc/tvbrowser/bin.nix
View file

@ -8,11 +8,9 @@ let
comment = "Themeable and easy to use TV Guide"; comment = "Themeable and easy to use TV Guide";
desktopName = "TV-Browser"; desktopName = "TV-Browser";
genericName = "Electronic TV Program Guide"; genericName = "Electronic TV Program Guide";
categories = "AudioVideo;TV;Java;"; categories = [ "AudioVideo" "TV" "Java" ];
startupNotify = "true"; startupNotify = true;
extraEntries = '' startupWMClass = "tvbrowser-TVBrowser";
StartupWMClass=tvbrowser-TVBrowser
'';
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {

4
pkgs/applications/misc/xmind/default.nix
View file

@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
icon = "xmind"; icon = "xmind";
desktopName = "XMind"; desktopName = "XMind";
comment = meta.description; comment = meta.description;
categories = "Office;"; categories = [ "Office" ];
mimeType = "application/xmind;x-scheme-handler/xmind"; mimeTypes = [ "application/xmind" "x-scheme-handler/xmind" ];
}; };
installPhase = let installPhase = let

3
pkgs/applications/misc/xpdf/default.nix
View file

@ -42,8 +42,7 @@ stdenv.mkDerivation rec {
comment = "Views Adobe PDF files"; comment = "Views Adobe PDF files";
icon = "xpdf"; icon = "xpdf";
exec = "xpdf %f"; exec = "xpdf %f";
categories = "Office;"; categories = [ "Office" ];
terminal = "false";
}; };
postInstall = lib.optionalString (!stdenv.isDarwin) '' postInstall = lib.optionalString (!stdenv.isDarwin) ''

4
pkgs/applications/networking/aether/default.nix
View file

@ -63,8 +63,8 @@ stdenv.mkDerivation rec {
icon = pname; icon = pname;
desktopName = "Aether"; desktopName = "Aether";
genericName = meta.description; genericName = meta.description;
categories = "Network;"; categories = [ "Network" ];
mimeType = "x-scheme-handler/aether"; mimeTypes = [ "x-scheme-handler/aether" ];
}) })
]; ];

2
pkgs/applications/networking/apache-directory-studio/default.nix
View file

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
comment = "Eclipse-based LDAP browser and directory client"; comment = "Eclipse-based LDAP browser and directory client";
desktopName = "Apache Directory Studio"; desktopName = "Apache Directory Studio";
genericName = "Apache Directory Studio"; genericName = "Apache Directory Studio";
categories = "Java;Network"; categories = [ "Java" "Network" ];
}; };
buildInputs = [ glib libsecret ]; buildInputs = [ glib libsecret ];

5
pkgs/applications/networking/browsers/firefox/wrapper.nix
View file

@ -159,11 +159,10 @@ let
name = applicationName; name = applicationName;
exec = "${applicationName}${nameSuffix} %U"; exec = "${applicationName}${nameSuffix} %U";
inherit icon; inherit icon;
comment = "";
desktopName = "${desktopName}${nameSuffix}${lib.optionalString forceWayland " (Wayland)"}"; desktopName = "${desktopName}${nameSuffix}${lib.optionalString forceWayland " (Wayland)"}";
genericName = "Web Browser"; genericName = "Web Browser";
categories = "Network;WebBrowser;"; categories = [ "Network" "WebBrowser" ];
mimeType = lib.concatStringsSep ";" [ mimeTypes = [
"text/html" "text/html"
"text/xml" "text/xml"
"application/xhtml+xml" "application/xhtml+xml"

2
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View file

@ -125,7 +125,7 @@ stdenv.mkDerivation rec {
desktopName = "Tor Browser"; desktopName = "Tor Browser";
genericName = "Web Browser"; genericName = "Web Browser";
comment = meta.description; comment = meta.description;
categories = "Network;WebBrowser;Security;"; categories = [ "Network" "WebBrowser" "Security" ];
}; };
buildCommand = '' buildCommand = ''

4
pkgs/applications/networking/browsers/vieb/default.nix
View file

@ -24,8 +24,8 @@ mkYarnPackage rec {
icon = "vieb"; icon = "vieb";
desktopName = "Web Browser"; desktopName = "Web Browser";
genericName = "Web Browser"; genericName = "Web Browser";
categories = "Network;WebBrowser;"; categories = [ "Network" "WebBrowser" ];
mimeType = lib.concatStringsSep ";" [ mimeTypes = [
"text/html" "text/html"
"application/xhtml+xml" "application/xhtml+xml"
"x-scheme-handler/http" "x-scheme-handler/http"

4
pkgs/applications/networking/browsers/webbrowser/default.nix
View file

@ -29,8 +29,8 @@ in stdenv.mkDerivation rec {
icon = "webbrowser"; icon = "webbrowser";
desktopName = "Web Browser"; desktopName = "Web Browser";
genericName = "Web Browser"; genericName = "Web Browser";
categories = "Network;WebBrowser;"; categories = [ "Network" "WebBrowser" ];
mimeType = lib.concatStringsSep ";" [ mimeTypes = [
"text/html" "text/html"
"text/xml" "text/xml"
"application/xhtml+xml" "application/xhtml+xml"

13
pkgs/applications/networking/charles/default.nix
View file

@ -11,14 +11,21 @@ let
generic = { version, sha256, platform ? "", jdk, ... }@attrs: generic = { version, sha256, platform ? "", jdk, ... }@attrs:
let let
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
categories = "Network;Development;WebDevelopment;Java;"; categories = [ "Network" "Development" "WebDevelopment" "Java" ];
desktopName = "Charles"; desktopName = "Charles";
exec = "charles %F"; exec = "charles %F";
genericName = "Web Debugging Proxy"; genericName = "Web Debugging Proxy";
icon = "charles-proxy"; icon = "charles-proxy";
mimeType = "application/x-charles-savedsession;application/x-charles-savedsession+xml;application/x-charles-savedsession+json;application/har+json;application/vnd.tcpdump.pcap;application/x-charles-trace"; mimeTypes = [
"application/x-charles-savedsession"
"application/x-charles-savedsession+xml"
"application/x-charles-savedsession+json"
"application/har+json"
"application/vnd.tcpdump.pcap"
"application/x-charles-trace"
];
name = "Charles"; name = "Charles";
startupNotify = "true"; startupNotify = true;
}; };
in stdenv.mkDerivation { in stdenv.mkDerivation {

2
pkgs/applications/networking/cisco-packet-tracer/7.nix
View file

@ -38,7 +38,7 @@ let
desktopName = "Cisco Packet Tracer 7"; desktopName = "Cisco Packet Tracer 7";
icon = "${ptFiles}/opt/pt/art/app.png"; icon = "${ptFiles}/opt/pt/art/app.png";
exec = "packettracer7 %f"; exec = "packettracer7 %f";
mimeType = "application/x-pkt;application/x-pka;application/x-pkz;"; mimeTypes = [ "application/x-pkt" "application/x-pka" "application/x-pkz" ];
}; };
fhs = buildFHSUserEnvBubblewrap { fhs = buildFHSUserEnvBubblewrap {

2
pkgs/applications/networking/cisco-packet-tracer/8.nix
View file

@ -94,7 +94,7 @@ let
desktopName = "Cisco Packet Tracer 8"; desktopName = "Cisco Packet Tracer 8";
icon = "${ptFiles}/opt/pt/art/app.png"; icon = "${ptFiles}/opt/pt/art/app.png";
exec = "packettracer8 %f"; exec = "packettracer8 %f";
mimeType = "application/x-pkt;application/x-pka;application/x-pkz;"; mimeTypes = [ "application/x-pkt" "application/x-pka" "application/x-pkz" ];
}; };
fhs = buildFHSUserEnvBubblewrap { fhs = buildFHSUserEnvBubblewrap {

4
pkgs/applications/networking/dropbox/default.nix
View file

@ -24,8 +24,8 @@ let
comment = "Sync your files across computers and to the web"; comment = "Sync your files across computers and to the web";
desktopName = "Dropbox"; desktopName = "Dropbox";
genericName = "File Synchronizer"; genericName = "File Synchronizer";
categories = "Network;FileTransfer;"; categories = [ "Network" "FileTransfer" ];
startupNotify = "false"; startupNotify = false;
icon = "dropbox"; icon = "dropbox";
}; };
in in

8
pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
View file

@ -103,11 +103,9 @@ in nodePackages.deltachat-desktop.override rec {
desktopName = "Delta Chat"; desktopName = "Delta Chat";
genericName = "Delta Chat"; genericName = "Delta Chat";
comment = meta.description; comment = meta.description;
categories = "Network;InstantMessaging;Chat;"; categories = [ "Network" "InstantMessaging" "Chat" ];
extraEntries = '' startupWMClass = "DeltaChat";
StartupWMClass=DeltaChat mimeTypes = [ "x-scheme-handler/openpgp4fpr" "x-scheme-handler/mailto" ];
MimeType=x-scheme-handler/openpgp4fpr;x-scheme-handler/mailto;
'';
}); });
passthru.updateScript = ./update.sh; passthru.updateScript = ./update.sh;

4
pkgs/applications/networking/instant-messengers/discord/linux.nix
View file

@ -100,8 +100,8 @@ stdenv.mkDerivation rec {
icon = pname; icon = pname;
inherit desktopName; inherit desktopName;
genericName = meta.description; genericName = meta.description;
categories = "Network;InstantMessaging;"; categories = [ "Network" "InstantMessaging" ];
mimeType = "x-scheme-handler/discord"; mimeTypes = [ "x-scheme-handler/discord" ];
}; };
passthru.updateScript = writeScript "discord-update-script" '' passthru.updateScript = writeScript "discord-update-script" ''

8
pkgs/applications/networking/instant-messengers/element/element-desktop.nix
View file

@ -106,11 +106,9 @@ mkYarnPackage rec {
desktopName = "Element"; desktopName = "Element";
genericName = "Matrix Client"; genericName = "Matrix Client";
comment = meta.description; comment = meta.description;
categories = "Network;InstantMessaging;Chat;"; categories = [ "Network" "InstantMessaging" "Chat" ];
extraEntries = '' startupWMClass = "element";
StartupWMClass=element mimeTypes = [ "x-scheme-handler/element" ];
MimeType=x-scheme-handler/element;
'';
}; };
passthru = { passthru = {

2
pkgs/applications/networking/instant-messengers/gitter/default.nix
View file

@ -88,7 +88,7 @@ in stdenv.mkDerivation rec {
icon = pname; icon = pname;
desktopName = "Gitter"; desktopName = "Gitter";
genericName = meta.description; genericName = meta.description;
categories = "Network;InstantMessaging;"; categories = [ "Network" "InstantMessaging" ];
}; };
meta = with lib; { meta = with lib; {

4
pkgs/applications/networking/instant-messengers/gomuks/default.nix
View file

@ -40,10 +40,10 @@ buildGoModule rec {
makeDesktopItem { makeDesktopItem {
name = "net.maunium.gomuks.desktop"; name = "net.maunium.gomuks.desktop";
exec = "@out@/bin/gomuks"; exec = "@out@/bin/gomuks";
terminal = "true"; terminal = true;
desktopName = "Gomuks"; desktopName = "Gomuks";
genericName = "Matrix client"; genericName = "Matrix client";
categories = "Network;Chat"; categories = [ "Network" "Chat" ];
comment = meta.description; comment = meta.description;
} }
}/* $out/ }/* $out/

2
pkgs/applications/networking/instant-messengers/jitsi/default.nix
View file

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
comment = "VoIP and Instant Messaging client"; comment = "VoIP and Instant Messaging client";
desktopName = "Jitsi"; desktopName = "Jitsi";
genericName = "Instant Messaging"; genericName = "Instant Messaging";
categories = "Chat"; categories = [ "Chat" ];
}; };
libPath = lib.makeLibraryPath ([ libPath = lib.makeLibraryPath ([

4
pkgs/applications/networking/instant-messengers/mikutter/default.nix
View file

@ -49,9 +49,9 @@ let
desktopName = "mikutter"; desktopName = "mikutter";
exec = "mikutter"; exec = "mikutter";
icon = "mikutter"; icon = "mikutter";
categories = "Network;"; categories = [ "Network" ];
comment = description; comment = description;
extraDesktopEntries.Keywords = "Mastodon;"; keywords = [ "Mastodon" ];
}; };
mkInfoPlist = { version }: mkInfoPlist = { version }:

3
pkgs/applications/networking/instant-messengers/rambox/rambox.nix
View file

@ -10,8 +10,7 @@ let
name = pname; name = pname;
exec = pname; exec = pname;
icon = pname; icon = pname;
type = "Application"; categories = [ "Network" ];
categories = "Network;";
}); });
appimageContents = appimageTools.extractType2 { appimageContents = appimageTools.extractType2 {

Some files were not shown because too many files have changed in this diff Show more