diff options
| author | Ben Siraphob <bensiraphob@gmail.com> | 2020-12-31 14:48:55 +0700 |
|---|---|---|
| committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-01 11:52:33 +0700 |
| commit | b04fc593e7b55fe1f74421b11589f12a339c92e2 (patch) | |
| tree | fa9bbaeb68f1e0cfa6ea2f9580ea2892eed41b3e /pkgs/tools/text | |
| parent | 54ab07c1fe4e39c5a84834f85300c63e3809ac2d (diff) | |
| download | nixpkgs-b04fc593e7b55fe1f74421b11589f12a339c92e2.tar nixpkgs-b04fc593e7b55fe1f74421b11589f12a339c92e2.tar.gz nixpkgs-b04fc593e7b55fe1f74421b11589f12a339c92e2.tar.bz2 nixpkgs-b04fc593e7b55fe1f74421b11589f12a339c92e2.tar.lz nixpkgs-b04fc593e7b55fe1f74421b11589f12a339c92e2.tar.xz nixpkgs-b04fc593e7b55fe1f74421b11589f12a339c92e2.tar.zst nixpkgs-b04fc593e7b55fe1f74421b11589f12a339c92e2.zip | |
treewide: cmake buildInputs to nativeBuildInputs, minor cleanups
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/ebook-tools/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/tools/text/jumanpp/default.nix | 4 |
2 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/tools/text/ebook-tools/default.nix b/pkgs/tools/text/ebook-tools/default.nix index 2a6af785692..b69ae66e1e2 100644 --- a/pkgs/tools/text/ebook-tools/default.nix +++ b/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; }; } diff --git a/pkgs/tools/text/jumanpp/default.nix b/pkgs/tools/text/jumanpp/default.nix index ecadb4a89d8..37d7577dfe6 100644 --- a/pkgs/tools/text/jumanpp/default.nix +++ b/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)"; |