From 994e5ddd0c8461ed573795f021b023e47642ed98 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 15 Jan 2018 14:53:49 +0100 Subject: [PATCH] apache-directory-studio: add missing desktop item (#33893) * apache-directory-studio: add missing desktop item * apache-directory-studio: use install command to copy icons --- .../apache-directory-studio/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/apache-directory-studio/default.nix b/pkgs/applications/networking/apache-directory-studio/default.nix index 36d0c9e4acf6..d593947f3e62 100644 --- a/pkgs/applications/networking/apache-directory-studio/default.nix +++ b/pkgs/applications/networking/apache-directory-studio/default.nix @@ -1,9 +1,20 @@ -{ stdenv, fetchurl, xorg, jre, makeWrapper }: +{ stdenv, fetchurl, xorg, jre, makeWrapper, makeDesktopItem }: let rpath = stdenv.lib.makeLibraryPath (with xorg; [ libXtst ]); + + desktopItem = makeDesktopItem { + name = "apache-directory-studio"; + exec = "ApacheDirectoryStudio"; + icon = "apache-directory-studio"; + comment = "Eclipse-based LDAP browser and directory client"; + desktopName = "Apache Directory Studio"; + genericName = "Apache Directory Studio"; + categories = "Java;Network"; + }; + in stdenv.mkDerivation rec { name = "apache-directory-studio-${version}"; @@ -36,6 +47,8 @@ stdenv.mkDerivation rec { "$out/bin/ApacheDirectoryStudio" \ --prefix PATH : "${jre}/bin" \ --prefix LD_LIBRARY_PATH : "${rpath}" + install -D icon.xpm "$out/share/pixmaps/apache-directory-studio.xpm" + install -D -t "$out/share/applications" ${desktopItem}/share/applications/* ''; meta = with stdenv.lib; {