diff --git a/pkgs/development/libraries/sentencepiece/default.nix b/pkgs/development/libraries/sentencepiece/default.nix index 05c641fab891..f825de549121 100644 --- a/pkgs/development/libraries/sentencepiece/default.nix +++ b/pkgs/development/libraries/sentencepiece/default.nix @@ -1,9 +1,10 @@ -{ config +{ lib , fetchFromGitHub , stdenv -, lib , cmake , gperftools + +, withGPerfTools ? true }: stdenv.mkDerivation rec { @@ -17,7 +18,9 @@ stdenv.mkDerivation rec { sha256 = "1ncvyw9ar0z7nd47cysxg5xrjm01y1shdlhp8l2pdpx059p3yx3w"; }; - nativeBuildInputs = [ cmake gperftools ]; + nativeBuildInputs = [ cmake ] ++ lib.optional withGPerfTools gperftools; + + outputs = [ "bin" "dev" "out" ]; meta = with stdenv.lib; { homepage = "https://github.com/google/sentencepiece"; diff --git a/pkgs/development/python-modules/sentencepiece/default.nix b/pkgs/development/python-modules/sentencepiece/default.nix index ab7a5387c024..430e61399b2f 100644 --- a/pkgs/development/python-modules/sentencepiece/default.nix +++ b/pkgs/development/python-modules/sentencepiece/default.nix @@ -6,10 +6,13 @@ buildPythonPackage rec { pname = "sentencepiece"; - inherit (sentencepiece) version src meta; + inherit (sentencepiece) version src; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ sentencepiece ]; + buildInputs = [ sentencepiece.dev ]; sourceRoot = "source/python"; + + # sentencepiece installs 'bin' output. + meta = builtins.removeAttrs sentencepiece.meta [ "outputsToInstall" ]; }