Merge branch 'master' into staging

3 files changed, 84 insertions, 10 deletions

diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index 7d191ccaba55..2d73a2680381 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -4,8 +4,6 @@
   , python, zlib, perl, texLive, texinfo, xz
 }:
 
-assert stdenv.isLinux;
-
 let
   s = # Generated upstream information
   rec {
@@ -17,10 +15,12 @@ let
     sha256="1dxwvq0xighqckkjkjva8s0igxfgy1j25z81pbwvlz6jzsrxpip9";
   };
   buildInputs = [
-   freeglut ghostscriptX imagemagick fftw 
-   boehmgc mesa_glu mesa_noglu mesa_noglu.osmesa ncurses readline gsl libsigsegv
-   python zlib perl texLive texinfo xz
-  ];
+   ghostscriptX imagemagick fftw
+   boehmgc ncurses readline gsl libsigsegv
+   python zlib perl texLive texinfo xz ]
+   ++ stdenv.lib.optionals stdenv.isLinux
+     [ freeglut mesa_glu mesa_noglu mesa_noglu.osmesa ]
+   ;
 in
 stdenv.mkDerivation {
   inherit (s) name version;
@@ -51,11 +51,11 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     inherit (s) version;
     description =  "A tool for programming graphics intended to replace Metapost";
-    license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = [stdenv.lib.maintainers.raskin stdenv.lib.maintainers.peti];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl3Plus;
+    maintainers = [ maintainers.raskin maintainers.peti ];
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix
new file mode 100644
index 000000000000..c441a4964b82
--- /dev/null
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchurl, cmake, pkgconfig, fcitx, gettext, libpinyin, glib, pcre, dbus, qt4 }:
+
+stdenv.mkDerivation rec {
+  name = "fcitx-libpinyin-${version}";
+  version = "0.3.91";
+
+  src = fetchurl {
+    url = "http://download.fcitx-im.org/fcitx-libpinyin/${name}.tar.xz";
+    sha256 = "19h0p1s8bkw24v7x6v19fg7dqpz2kkjlvvrqhypi5bkkvfswf7xn";
+  };
+
+  buildInputs = [ cmake pkgconfig fcitx gettext libpinyin glib pcre dbus qt4 ];
+
+  preInstall = ''
+    substituteInPlace src/cmake_install.cmake \
+      --replace ${fcitx} $out
+    substituteInPlace po/cmake_install.cmake \
+      --replace ${fcitx} $out
+    substituteInPlace data/cmake_install.cmake \
+      --replace ${fcitx} $out
+    substituteInPlace dictmanager/cmake_install.cmake \
+      --replace ${fcitx} $out
+  '';
+
+  preBuild = let
+    store_path = fetchurl {
+      url = https://download.fcitx-im.org/data/model.text.20130308.tar.gz;
+      sha256 = "0s8sazix29z1ilxmkw2f0bv6i349awd89ibylf9ixy615s1vb5a5";
+    };
+  in
+    ''
+      cp -rv ${store_path} $NIX_BUILD_TOP/$name/data/model.text.20130308.tar.gz
+    '';
+
+  meta = with stdenv.lib; {
+    isFcitxEngine = true;
+    description  = "Fcitx Wrapper for libpinyin, Library to deal with pinyin";
+    homepage     = https://github.com/fcitx/fcitx-libpinyin;
+    license      = licenses.gpl3Plus;
+    maintainers = with maintainers; [ ericsagnes ];
+    platforms    = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix
new file mode 100644
index 000000000000..d2929ab90f42
--- /dev/null
+++ b/pkgs/tools/text/languagetool/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, fetchurl, unzip, jdk }:
+
+stdenv.mkDerivation rec {
+  pname = "LanguageTool";
+  version = "3.5";
+  name = pname + "-" + version;
+  src = fetchurl {
+    url = "https://www.languagetool.org/download/${name}.zip";
+    sha256 = "1axw8fqg2wlkmv45s71q5pg44sg1s06szpkjhyscy704i7d2jc34";
+  };
+  buildInputs = [ unzip jdk ];
+  installPhase =
+  ''
+    mkdir -p $out/{bin,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
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://languagetool.org";
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ edwtjo ];
+    descrption = "A proofreading program for English, French German, Polish, and more";
+  };
+}