about summary refs log tree commit diff
path: root/pkgs/development/tools
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2014-10-10 16:02:50 +0100
committerVincent Laporte <Vincent.Laporte@gmail.com>2014-10-10 17:00:30 +0100
commit4f0bc8e060d85e76dc84094e63c83200f3cf1be6 (patch)
tree5e687eabe40848e9240aa96c1ba3af8c33a2a74b /pkgs/development/tools
parent7bfe6144c66a9fb918eaae1b95e2c7bd7d01199b (diff)
downloadnixlib-4f0bc8e060d85e76dc84094e63c83200f3cf1be6.tar
nixlib-4f0bc8e060d85e76dc84094e63c83200f3cf1be6.tar.gz
nixlib-4f0bc8e060d85e76dc84094e63c83200f3cf1be6.tar.bz2
nixlib-4f0bc8e060d85e76dc84094e63c83200f3cf1be6.tar.lz
nixlib-4f0bc8e060d85e76dc84094e63c83200f3cf1be6.tar.xz
nixlib-4f0bc8e060d85e76dc84094e63c83200f3cf1be6.tar.zst
nixlib-4f0bc8e060d85e76dc84094e63c83200f3cf1be6.zip
ocaml-oasis: adds missing dependency to caml4
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r--pkgs/development/tools/ocaml/oasis/default.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix
index 6c47ade61f63..3f172e6aaf2b 100644
--- a/pkgs/development/tools/ocaml/oasis/default.nix
+++ b/pkgs/development/tools/ocaml/oasis/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib, ocaml_data_notation, ocaml_typeconv,
+{stdenv, fetchurl, ocaml, findlib, ocaml_data_notation, ocaml_typeconv, camlp4,
  ocamlmod, ocamlify, ounit, expect}:
 
 stdenv.mkDerivation {
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   buildInputs =
     [
-      ocaml findlib ocaml_typeconv ocamlmod ocamlify ounit
+      ocaml findlib ocaml_typeconv ocamlmod ocamlify ounit camlp4
     ];
 
   propagatedBuildInputs = [ ocaml_data_notation ];
@@ -22,13 +22,13 @@ stdenv.mkDerivation {
   buildPhase     = "ocaml setup.ml -build";
   installPhase   = "ocaml setup.ml -install";
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://oasis.forge.ocamlcore.org/;
     description = "Configure, build and install system for OCaml projects";
-    license = stdenv.lib.licenses.lgpl21;
+    license = licenses.lgpl21;
     platforms = ocaml.meta.platforms;
-    maintainers = with stdenv.lib.maintainers; [
-      z77z
+    maintainers = with maintainers; [
+      vbgl z77z
     ];
   };
 }