summary refs log tree commit diff
path: root/pkgs/development/ocaml-modules
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2017-02-02 20:15:34 +0000
committerVincent Laporte <Vincent.Laporte@gmail.com>2017-02-02 20:27:30 +0000
commit78960abfc7bdc502d8b4a7312f3dcddad8c1e888 (patch)
treeb611c9b4362ec45b39ab93ebcbffc8e43bb918f8 /pkgs/development/ocaml-modules
parent14a99b9e56467c962687e9549ea7bb835900dac9 (diff)
downloadnixpkgs-78960abfc7bdc502d8b4a7312f3dcddad8c1e888.tar
nixpkgs-78960abfc7bdc502d8b4a7312f3dcddad8c1e888.tar.gz
nixpkgs-78960abfc7bdc502d8b4a7312f3dcddad8c1e888.tar.bz2
nixpkgs-78960abfc7bdc502d8b4a7312f3dcddad8c1e888.tar.lz
nixpkgs-78960abfc7bdc502d8b4a7312f3dcddad8c1e888.tar.xz
nixpkgs-78960abfc7bdc502d8b4a7312f3dcddad8c1e888.tar.zst
nixpkgs-78960abfc7bdc502d8b4a7312f3dcddad8c1e888.zip
ocamlPackages.vg: add ocamlbuild as dependency
Diffstat (limited to 'pkgs/development/ocaml-modules')
-rw-r--r--pkgs/development/ocaml-modules/vg/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix
index aa6047c7901..cb7878ac731 100644
--- a/pkgs/development/ocaml-modules/vg/default.nix
+++ b/pkgs/development/ocaml-modules/vg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, opam, topkg
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
 , uchar, result, gg, uutf, otfm, js_of_ocaml,
   pdfBackend ? true, # depends on uutf and otfm
   htmlcBackend ? true # depends on js_of_ocaml
@@ -17,14 +17,14 @@ assert versionAtLeast ocaml.version "4.02.0";
 
 stdenv.mkDerivation rec {
 
-  name = "ocaml-${pname}-${version}";
+  name = "ocaml${ocaml.version}-${pname}-${version}";
 
   src = fetchurl {
     url = "${webpage}/releases/${pname}-${version}.tbz";
     sha256 = "1czd2fq85hy24w5pllarsq4pvbx9rda5zdikxfxdng8s9kff2h3f";
   };
 
-  buildInputs = [ ocaml findlib opam topkg ];
+  buildInputs = [ ocaml findlib ocamlbuild opam topkg ];
 
   propagatedBuildInputs = [ uchar result gg ]
                           ++ optionals pdfBackend [ uutf otfm ]