From a97cf72a27fc3171a9eaad99369bd9aed579629e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 29 Sep 2014 23:54:20 +0200 Subject: [PATCH] ocaml-sexplib: propagate the dependency to typeconv And requires camlp4 --- pkgs/development/ocaml-modules/sexplib/108.08.00.nix | 10 ++++++---- pkgs/development/ocaml-modules/sexplib/default.nix | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix index 3e73b562e7e9..3dbb0ea8e818 100644 --- a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix +++ b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, typeconv}: +{stdenv, fetchurl, ocaml, findlib, typeconv, camlp4}: let ocaml_version = (builtins.parseDrvName ocaml.name).version; @@ -14,14 +14,16 @@ stdenv.mkDerivation { sha256 = "11z1k1d7dbb5m957klgalimpr0r602xp5zkkbgbffib1bphasarg"; }; - buildInputs = [ocaml findlib typeconv ]; + buildInputs = [ocaml findlib]; + propagatedBuildInputs = [typeconv camlp4]; createFindlibDestdir = true; - meta = { + meta = with stdenv.lib; { homepage = https://ocaml.janestreet.com/; description = "Library for serializing OCaml values to and from S-expressions"; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; + maintainers = [ maintainers.vbgl ]; platforms = ocaml.meta.platforms; }; } diff --git a/pkgs/development/ocaml-modules/sexplib/default.nix b/pkgs/development/ocaml-modules/sexplib/default.nix index 6f744778875c..a32c6a0e2ce6 100644 --- a/pkgs/development/ocaml-modules/sexplib/default.nix +++ b/pkgs/development/ocaml-modules/sexplib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, ocaml_typeconv}: +{stdenv, fetchurl, ocaml, findlib, ocaml_typeconv, camlp4}: let ocaml_version = (builtins.parseDrvName ocaml.name).version; @@ -14,14 +14,16 @@ stdenv.mkDerivation { sha256 = "0qh0zqp5nakqpmmhh4x7cg03vqj3j2bj4zj0nqdlksai188p9ila"; }; - buildInputs = [ocaml findlib ocaml_typeconv ]; + buildInputs = [ocaml findlib]; + propagatedBuildInputs = [ocaml_typeconv camlp4]; createFindlibDestdir = true; - meta = { + meta = with stdenv.lib; { homepage = https://ocaml.janestreet.com/; description = "Library for serializing OCaml values to and from S-expressions"; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; + maintainers = [ maintainers.vbgl ]; platforms = ocaml.meta.platforms; }; }