public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

piqi: missed propagated dependency

Browse Source
This commit is contained in:
Matthew Maurer 2017-01-25 02:06:38 -05:00 committed by Vincent Laporte
parent 3c7b0d37ae
commit 4e47e85005
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/ocaml-modules/piqi-ocaml/default.nix
View File

@ -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 { stdenv.mkDerivation rec {
version = "0.7.5"; version = "0.7.5";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0ngz6y8i98i5v2ma8nk6mc83pdsmf2z0ks7m3xi6clfg3zqbddrv"; sha256 = "0ngz6y8i98i5v2ma8nk6mc83pdsmf2z0ks7m3xi6clfg3zqbddrv";
}; };
buildInputs = [ocaml findlib piqi base64 camlp4]; buildInputs = [ ocaml findlib piqi camlp4 ];
createFindlibDestdir = true; createFindlibDestdir = true;

9
pkgs/development/ocaml-modules/piqi/default.nix
View File

@ -9,13 +9,18 @@ stdenv.mkDerivation rec {
sha256 = "1whqr2bb3gds2zmrzqnv8vqka9928w4lx6mi6g244kmbwb2h8d8l"; sha256 = "1whqr2bb3gds2zmrzqnv8vqka9928w4lx6mi6g244kmbwb2h8d8l";
}; };
buildInputs = [ocaml findlib camlp4 which ocaml_optcomp base64]; buildInputs = [ocaml findlib camlp4 which ocaml_optcomp];
propagatedBuildInputs = [ulex xmlm easy-format]; propagatedBuildInputs = [ulex xmlm easy-format base64];
patches = [ ./no-ocamlpath-override.patch ]; patches = [ ./no-ocamlpath-override.patch ];
createFindlibDestdir = true; createFindlibDestdir = true;
buildPhase = ''
make
make -C piqilib piqilib.cma
'';
installPhase = '' installPhase = ''
make install; make install;
make ocaml-install; make ocaml-install;