diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2020-05-21 13:45:44 +0100 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2020-10-02 10:06:55 +0200 |
commit | 38b2cbe934cdb671b9fdc3d8b354c06ad030f8d0 (patch) | |
tree | 5b2d3f8bfe376dfbd70c08b29a73a2c129cc2425 /pkgs/applications/networking/apache-directory-studio/default.nix | |
parent | 6353c2dee299caa273a92bbcc05c5f5281410bbe (diff) | |
download | nixpkgs-38b2cbe934cdb671b9fdc3d8b354c06ad030f8d0.tar nixpkgs-38b2cbe934cdb671b9fdc3d8b354c06ad030f8d0.tar.gz nixpkgs-38b2cbe934cdb671b9fdc3d8b354c06ad030f8d0.tar.bz2 nixpkgs-38b2cbe934cdb671b9fdc3d8b354c06ad030f8d0.tar.lz nixpkgs-38b2cbe934cdb671b9fdc3d8b354c06ad030f8d0.tar.xz nixpkgs-38b2cbe934cdb671b9fdc3d8b354c06ad030f8d0.tar.zst nixpkgs-38b2cbe934cdb671b9fdc3d8b354c06ad030f8d0.zip |
apache-directory-studio: 2.0.0-M14 -> 2.0.0-M15
Diffstat (limited to 'pkgs/applications/networking/apache-directory-studio/default.nix')
-rw-r--r-- | pkgs/applications/networking/apache-directory-studio/default.nix | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/pkgs/applications/networking/apache-directory-studio/default.nix b/pkgs/applications/networking/apache-directory-studio/default.nix index 0c8136724ff..141bbe654b7 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 }: +{ stdenv, fetchurl, jdk14, 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-M15"; + versionWithDate = "2.0.0.v20200411-M15"; 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 = "1rkyb0qcsl9hk2qcwp5mwaab69q3sn77v5xyn9mbvi5wg9icbc37"; } else throw "Unsupported system: ${stdenv.hostPlatform.system}"; - buildInputs = [ makeWrapper ]; + buildInputs = [ glib libsecret ]; + nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; installPhase = '' dest="$out/libexec/ApacheDirectoryStudio" @@ -44,10 +36,10 @@ 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 : "${jdk14}/bin" install -D icon.xpm "$out/share/pixmaps/apache-directory-studio.xpm" install -D -t "$out/share/applications" ${desktopItem}/share/applications/* ''; |