diff options
| author | Matthew Maurer <matthew.r.maurer@gmail.com> | 2017-01-25 02:06:38 -0500 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-03-29 07:11:09 +0000 |
| commit | 4e47e8500584a6769ca4e8b0207f55d09222e803 (patch) | |
| tree | b32be99909fd76d218b5d109d351a407e6b7e7e3 /pkgs/development/ocaml-modules | |
| parent | 3c7b0d37ae68b0db3b14efa079aa36742edb5714 (diff) | |
| download | nixlib-4e47e8500584a6769ca4e8b0207f55d09222e803.tar nixlib-4e47e8500584a6769ca4e8b0207f55d09222e803.tar.gz nixlib-4e47e8500584a6769ca4e8b0207f55d09222e803.tar.bz2 nixlib-4e47e8500584a6769ca4e8b0207f55d09222e803.tar.lz nixlib-4e47e8500584a6769ca4e8b0207f55d09222e803.tar.xz nixlib-4e47e8500584a6769ca4e8b0207f55d09222e803.tar.zst nixlib-4e47e8500584a6769ca4e8b0207f55d09222e803.zip | |
piqi: missed propagated dependency
Diffstat (limited to 'pkgs/development/ocaml-modules')
| -rw-r--r-- | pkgs/development/ocaml-modules/piqi-ocaml/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/piqi/default.nix | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix index 488a13ecf161..165a566b1b71 100644 --- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, piqi, ulex, easy-format, xmlm, base64, camlp4}: +{ stdenv, fetchurl, ocaml, findlib, piqi, ulex, easy-format, xmlm, camlp4 }: stdenv.mkDerivation rec { version = "0.7.5"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ngz6y8i98i5v2ma8nk6mc83pdsmf2z0ks7m3xi6clfg3zqbddrv"; }; - buildInputs = [ocaml findlib piqi base64 camlp4]; + buildInputs = [ ocaml findlib piqi camlp4 ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/piqi/default.nix b/pkgs/development/ocaml-modules/piqi/default.nix index 273cd8f1862c..f8126f91d876 100644 --- a/pkgs/development/ocaml-modules/piqi/default.nix +++ b/pkgs/development/ocaml-modules/piqi/default.nix @@ -9,13 +9,18 @@ stdenv.mkDerivation rec { sha256 = "1whqr2bb3gds2zmrzqnv8vqka9928w4lx6mi6g244kmbwb2h8d8l"; }; - buildInputs = [ocaml findlib camlp4 which ocaml_optcomp base64]; - propagatedBuildInputs = [ulex xmlm easy-format]; + buildInputs = [ocaml findlib camlp4 which ocaml_optcomp]; + propagatedBuildInputs = [ulex xmlm easy-format base64]; patches = [ ./no-ocamlpath-override.patch ]; createFindlibDestdir = true; + buildPhase = '' + make + make -C piqilib piqilib.cma + ''; + installPhase = '' make install; make ocaml-install; |