apache-directory-studio: add missing desktop item (#33893)

* apache-directory-studio: add missing desktop item

* apache-directory-studio: use install command to copy icons
This commit is contained in:
Florian Klink 2018-01-15 14:53:49 +01:00 committed by Jörg Thalheim
parent 4c63cc8c4b
commit 994e5ddd0c

View File

@ -1,9 +1,20 @@
{ stdenv, fetchurl, xorg, jre, makeWrapper }: { stdenv, fetchurl, xorg, jre, makeWrapper, makeDesktopItem }:
let let
rpath = stdenv.lib.makeLibraryPath (with xorg; [ rpath = stdenv.lib.makeLibraryPath (with xorg; [
libXtst 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 in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "apache-directory-studio-${version}"; name = "apache-directory-studio-${version}";
@ -36,6 +47,8 @@ stdenv.mkDerivation rec {
"$out/bin/ApacheDirectoryStudio" \ "$out/bin/ApacheDirectoryStudio" \
--prefix PATH : "${jre}/bin" \ --prefix PATH : "${jre}/bin" \
--prefix LD_LIBRARY_PATH : "${rpath}" --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; { meta = with stdenv.lib; {