treewide: cmake buildInputs to nativeBuildInputs, minor cleanups

pkgs/tools/text/ebook-tools/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, libxml2, libzip }:
+{ stdenv, fetchurl, cmake, pkg-config, libxml2, libzip }:
 
 stdenv.mkDerivation rec {
   name = "ebook-tools-0.2.2";
@@ -8,18 +8,19 @@ stdenv.mkDerivation rec {
     sha256 = "1bi7wsz3p5slb43kj7lgb3r6lb91lvb6ldi556k4y50ix6b5khyb";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake libxml2 libzip ];
+  nativeBuildInputs = [ cmake pkg-config ];
+  buildInputs = [ libxml2 libzip ];
 
-  preConfigure = 
+  preConfigure =
     ''
       NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libzip)"
     '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://ebook-tools.sourceforge.net";
     description = "Tools and library for dealing with various ebook file formats";
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
+    license = licenses.mit;
   };
 }

pkgs/tools/text/jumanpp/default.nix

@@ -1,4 +1,5 @@
 { stdenv, fetchurl, cmake, protobuf }:
+
 stdenv.mkDerivation rec {
   pname = "jumanpp";
   version = "2.0.0-rc2";
@@ -7,7 +8,8 @@ stdenv.mkDerivation rec {
     url = "https://github.com/ku-nlp/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz";
     sha256 = "17fzmd0f5m9ayfhsr0mg7hjp3pg1mhbgknhgyd8v87x46g8bg6qp";
   };
-  buildInputs = [ cmake protobuf ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ protobuf ];
 
   meta = with stdenv.lib; {
     description = "A Japanese morphological analyser using a recurrent neural network language model (RNNLM)";