diff options
author | Orivej Desh <orivej@gmx.fr> | 2017-11-21 22:48:36 +0000 |
---|---|---|
committer | Orivej Desh <orivej@gmx.fr> | 2017-11-21 22:48:36 +0000 |
commit | b8e1e7191e99af29125fbb37f42cb68f43af800c (patch) | |
tree | 1ca52bd4c93d50473ebdb7cebc7721140e84a924 /pkgs/tools/text | |
parent | 71a2a5ae40b2b94150365bb846fb78b620562df8 (diff) | |
parent | 91d2cf96424cc5209d3cf799bc2b4fa52af34596 (diff) | |
download | nixlib-b8e1e7191e99af29125fbb37f42cb68f43af800c.tar nixlib-b8e1e7191e99af29125fbb37f42cb68f43af800c.tar.gz nixlib-b8e1e7191e99af29125fbb37f42cb68f43af800c.tar.bz2 nixlib-b8e1e7191e99af29125fbb37f42cb68f43af800c.tar.lz nixlib-b8e1e7191e99af29125fbb37f42cb68f43af800c.tar.xz nixlib-b8e1e7191e99af29125fbb37f42cb68f43af800c.tar.zst nixlib-b8e1e7191e99af29125fbb37f42cb68f43af800c.zip |
Merge branch 'master' into staging
* master: (80 commits) lkl: Supports aarch64 wimlib: nitpicks gitAndTools.git-codeowners: 0.1.1 -> 0.1.2 wimlib: init at 1.12.0 kernel: improve modDirVersion error message releaseTools.sourceTarball: Clean up temporary files dotnetPackages.SmartIrc4net: rehash source migmix: make it a fixed-output derivation vm: Create /dev/full samba: 4.6.8 -> 4.6.11 to address CVEs CVE-2017-14746 & CVE-2017-15275 microcodeIntel: 20170707 -> 20171117 sshd: Remove ripemd160 MACs kernel config: Enable MEDIA_CONTROLLER linux: 4.4.99 -> 4.4.100 linux: 4.9.63 -> 4.9.64 nix-bash-completions: 0.4 -> 0.5 linux: 4.14 -> 4.14.1 linux: 4.13.14 -> 4.13.15 nix-zsh-completions: 0.3.3 -> 0.3.5 dns-root-data: use a stable URL that I maintain anyway ...
Diffstat (limited to 'pkgs/tools/text')
-rw-r--r-- | pkgs/tools/text/languagetool/default.nix | 41 |
1 files changed, 19 insertions, 22 deletions
diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index 4f3f8af3256d..6fcfd6fff85f 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -1,30 +1,27 @@ -{ stdenv, lib, fetchurl, unzip, jdk }: +{ stdenv, fetchzip, jre, makeWrapper }: stdenv.mkDerivation rec { - pname = "LanguageTool"; - version = "3.7"; - name = pname + "-" + version; - src = fetchurl { + name = "LanguageTool-${version}"; + version = "3.9"; + + src = fetchzip { url = "https://www.languagetool.org/download/${name}.zip"; - sha256 = "04i49z022k3nyyr8hnlxima9k5id8qvh2nr3dv8zgcqm5sin6xx9"; + sha256 = "0hqb4hbl7iryw1xk8q1i606azzgzdr17sy6xfr1zpas4r2pnvhfq"; }; - buildInputs = [ unzip jdk ]; - installPhase = - '' - mkdir -p $out/{bin,share} - mv * $out/share/. + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre ]; + + installPhase = '' + mkdir -p $out/share + mv * $out/share/ + for lt in languagetool{,-commandline,-server};do - cat > $out/bin/$lt <<EXE - #!${stdenv.shell} - ${jdk}/bin/java -cp $out/share/ -jar $out/share/$lt.jar "\$@" - EXE - chmod +x $out/bin/$lt + makeWrapper ${jre}/bin/java $out/bin/$lt \ + --add-flags "-cp $out/share/ -jar $out/share/$lt.jar" done - cat > $out/bin/languagetool-http-server <<EXE - #!${stdenv.shell} - ${jdk}/bin/java -cp $out/share/languagetool-server.jar org.languagetool.server.HTTPServer "\$@" - EXE - chmod +x $out/bin/languagetool-http-server + + makeWrapper ${jre}/bin/java $out/bin/languagetool-http-server \ + --add-flags "-cp $out/share/languagetool-server.jar org.languagetool.server.HTTPServer" ''; meta = with stdenv.lib; { @@ -34,6 +31,6 @@ stdenv.mkDerivation rec { edwtjo jgeerds ]; - descrption = "A proofreading program for English, French German, Polish, and more"; + description = "A proofreading program for English, French German, Polish, and more"; }; } |