philipp
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

apache-directory-studio: 2.0.0-M14 -> 2.0.0-M15

gstqt5
Jörg Thalheim 2020-05-21 13:45:44 +01:00
parent 6353c2dee2
commit 38b2cbe934
No known key found for this signature in database
GPG Key ID: 003F2096411B5F92
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/applications/networking/apache-directory-studio/default.nix
View File

@ -1,10 +1,6 @@
{ stdenv, fetchurl, xorg, jre, makeWrapper, makeDesktopItem }: { stdenv, fetchurl, jdk14, makeWrapper, autoPatchelfHook, makeDesktopItem, glib, libsecret }:
let let
rpath = stdenv.lib.makeLibraryPath (with xorg; [
libXtst
]);
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = "apache-directory-studio"; name = "apache-directory-studio";
exec = "ApacheDirectoryStudio"; exec = "ApacheDirectoryStudio";
@ -14,8 +10,8 @@ let
genericName = "Apache Directory Studio"; genericName = "Apache Directory Studio";
categories = "Java;Network"; categories = "Java;Network";
}; };
version = "2.0.0-M14"; version = "2.0.0-M15";
versionWithDate = "2.0.0.v20180908-M14"; versionWithDate = "2.0.0.v20200411-M15";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "apache-directory-studio"; pname = "apache-directory-studio";
@ -25,16 +21,12 @@ stdenv.mkDerivation rec {
if stdenv.hostPlatform.system == "x86_64-linux" then if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl { fetchurl {
url = "mirror://apache/directory/studio/${versionWithDate}/ApacheDirectoryStudio-${versionWithDate}-linux.gtk.x86_64.tar.gz"; url = "mirror://apache/directory/studio/${versionWithDate}/ApacheDirectoryStudio-${versionWithDate}-linux.gtk.x86_64.tar.gz";
sha256 = "0kq4l3755q69p7bry9xpm5xxw56ksncp76fdqqd1xzbvsg309bps"; sha256 = "1rkyb0qcsl9hk2qcwp5mwaab69q3sn77v5xyn9mbvi5wg9icbc37";
}
else if stdenv.hostPlatform.system == "i686-linux" then
fetchurl {
url = "mirror://apache/directory/studio/${versionWithDate}/ApacheDirectoryStudio-${versionWithDate}-linux.gtk.x86.tar.gz";
sha256 = "038dy8jjgq5gj5r56y9ps3ycqi9gn57i4q1r3mmjx1b1950wmh1q";
} }
else throw "Unsupported system: ${stdenv.hostPlatform.system}"; else throw "Unsupported system: ${stdenv.hostPlatform.system}";
buildInputs = [ makeWrapper ]; buildInputs = [ glib libsecret ];
nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
installPhase = '' installPhase = ''
dest="$out/libexec/ApacheDirectoryStudio" dest="$out/libexec/ApacheDirectoryStudio"
@ -44,10 +36,10 @@ stdenv.mkDerivation rec {
mkdir -p "$out/bin" mkdir -p "$out/bin"
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
"$dest/ApacheDirectoryStudio" "$dest/ApacheDirectoryStudio"
makeWrapper "$dest/ApacheDirectoryStudio" \ makeWrapper "$dest/ApacheDirectoryStudio" \
"$out/bin/ApacheDirectoryStudio" \ "$out/bin/ApacheDirectoryStudio" \
--prefix PATH : "${jre}/bin" \ --prefix PATH : "${jdk14}/bin"
--prefix LD_LIBRARY_PATH : "${rpath}"
install -D icon.xpm "$out/share/pixmaps/apache-directory-studio.xpm" install -D icon.xpm "$out/share/pixmaps/apache-directory-studio.xpm"
install -D -t "$out/share/applications" ${desktopItem}/share/applications/* install -D -t "$out/share/applications" ${desktopItem}/share/applications/*
''; '';