diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-07-29 13:32:04 +0000 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-07-29 13:32:04 +0000 |
| commit | bbf96f865286f87bbff9bc6679f4ee9c2584ad53 (patch) | |
| tree | 175d893bba6dfa53390249c384d6ced47a92cf22 /pkgs/development/ocaml-modules | |
| parent | 562a264be499f9ffdeab9fa03efdc0a7c90d4959 (diff) | |
| download | nixpkgs-bbf96f865286f87bbff9bc6679f4ee9c2584ad53.tar nixpkgs-bbf96f865286f87bbff9bc6679f4ee9c2584ad53.tar.gz nixpkgs-bbf96f865286f87bbff9bc6679f4ee9c2584ad53.tar.bz2 nixpkgs-bbf96f865286f87bbff9bc6679f4ee9c2584ad53.tar.lz nixpkgs-bbf96f865286f87bbff9bc6679f4ee9c2584ad53.tar.xz nixpkgs-bbf96f865286f87bbff9bc6679f4ee9c2584ad53.tar.zst nixpkgs-bbf96f865286f87bbff9bc6679f4ee9c2584ad53.zip | |
ocamlPackages.asn1-combinators: remove spurious dependency to Camlp4
Diffstat (limited to 'pkgs/development/ocaml-modules')
| -rw-r--r-- | pkgs/development/ocaml-modules/asn1-combinators/default.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix index 78102b9c673..c6d99fa33e7 100644 --- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix +++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild , cstruct, zarith, ounit, result, topkg, ptime }: @@ -10,16 +10,14 @@ let param = } else { version = "0.1.3"; sha256 = "0hpn049i46sdnv2i6m7r6m6ch0jz8argybh71wykbvcqdby08zxj"; - propagatedBuildInputs = [ ]; + propagatedBuildInputs = [ ]; }; in -buildOcaml rec { - name = "asn1-combinators"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-asn1-combinators-${version}"; inherit (param) version; - minimumSupportedOcamlVersion = "4.01"; - src = fetchFromGitHub { owner = "mirleft"; repo = "ocaml-asn1-combinators"; @@ -27,7 +25,7 @@ buildOcaml rec { inherit (param) sha256; }; - buildInputs = [ ocaml findlib ounit topkg ]; + buildInputs = [ ocaml findlib ocamlbuild ounit topkg ]; propagatedBuildInputs = [ result cstruct zarith ] ++ param.propagatedBuildInputs; buildPhase = "${topkg.run} build --tests true"; |