Merge branch 'nixpkgs-update' into master

1 files changed, 9 insertions, 17 deletions

diff --git a/pkgs/applications/networking/apache-directory-studio/default.nix b/pkgs/applications/networking/apache-directory-studio/default.nix
index 0c8136724ff..b37039c94d2 100644
--- a/pkgs/applications/networking/apache-directory-studio/default.nix
+++ b/pkgs/applications/networking/apache-directory-studio/default.nix
@@ -1,10 +1,6 @@
-{ stdenv, fetchurl, xorg, jre, makeWrapper, makeDesktopItem }:
+{ lib, stdenv, fetchurl, jdk, makeWrapper, autoPatchelfHook, makeDesktopItem, glib, libsecret }:
 
 let
-  rpath = stdenv.lib.makeLibraryPath (with xorg; [
-    libXtst
-  ]);
-
   desktopItem = makeDesktopItem {
     name = "apache-directory-studio";
     exec = "ApacheDirectoryStudio";
@@ -14,8 +10,8 @@ let
     genericName = "Apache Directory Studio";
     categories = "Java;Network";
   };
-  version = "2.0.0-M14";
-  versionWithDate = "2.0.0.v20180908-M14";
+  version = "2.0.0-M17";
+  versionWithDate = "2.0.0.v20210717-M17";
 in
 stdenv.mkDerivation rec {
   pname = "apache-directory-studio";
@@ -25,16 +21,12 @@ stdenv.mkDerivation rec {
     if stdenv.hostPlatform.system == "x86_64-linux" then
       fetchurl {
         url = "mirror://apache/directory/studio/${versionWithDate}/ApacheDirectoryStudio-${versionWithDate}-linux.gtk.x86_64.tar.gz";
-        sha256 = "0kq4l3755q69p7bry9xpm5xxw56ksncp76fdqqd1xzbvsg309bps";
-      }
-    else if stdenv.hostPlatform.system == "i686-linux" then
-      fetchurl {
-        url = "mirror://apache/directory/studio/${versionWithDate}/ApacheDirectoryStudio-${versionWithDate}-linux.gtk.x86.tar.gz";
-        sha256 = "038dy8jjgq5gj5r56y9ps3ycqi9gn57i4q1r3mmjx1b1950wmh1q";
+        sha256 = "19zdspzv4n3mfgb1g45s3wh0vbvn6a9zjd4xi5x2afmdjkzlwxi4";
       }
     else throw "Unsupported system: ${stdenv.hostPlatform.system}";
 
-  buildInputs = [ makeWrapper ];
+  buildInputs = [ glib libsecret ];
+  nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
 
   installPhase = ''
     dest="$out/libexec/ApacheDirectoryStudio"
@@ -44,15 +36,15 @@ stdenv.mkDerivation rec {
     mkdir -p "$out/bin"
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
         "$dest/ApacheDirectoryStudio"
+
     makeWrapper "$dest/ApacheDirectoryStudio" \
         "$out/bin/ApacheDirectoryStudio" \
-        --prefix PATH : "${jre}/bin" \
-        --prefix LD_LIBRARY_PATH : "${rpath}"
+        --prefix PATH : "${jdk}/bin"
     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 lib; {
     description = "Eclipse-based LDAP browser and directory client";
     homepage = "https://directory.apache.org/studio/";
     license = licenses.asl20;