diff options
author | sternenseemann <git@lukasepple.de> | 2016-11-17 21:37:56 +0100 |
---|---|---|
committer | sternenseemann <git@lukasepple.de> | 2016-11-17 21:38:09 +0100 |
commit | cbfc766ad4203bf0b858084377ad91fc6c5219b1 (patch) | |
tree | b72d97ddd02b7c7b9203384554591287f6eb7718 /pkgs/development/ocaml-modules | |
parent | f6a7296499cb397651f3ec8d7244330db88980d7 (diff) | |
download | nixlib-cbfc766ad4203bf0b858084377ad91fc6c5219b1.tar nixlib-cbfc766ad4203bf0b858084377ad91fc6c5219b1.tar.gz nixlib-cbfc766ad4203bf0b858084377ad91fc6c5219b1.tar.bz2 nixlib-cbfc766ad4203bf0b858084377ad91fc6c5219b1.tar.lz nixlib-cbfc766ad4203bf0b858084377ad91fc6c5219b1.tar.xz nixlib-cbfc766ad4203bf0b858084377ad91fc6c5219b1.tar.zst nixlib-cbfc766ad4203bf0b858084377ad91fc6c5219b1.zip |
ocaml-cstruct: remove camlp4 support
This change solves dependency issues related to camlp4, async_p4 and sexplib_p4
Diffstat (limited to 'pkgs/development/ocaml-modules')
-rw-r--r-- | pkgs/development/ocaml-modules/cstruct/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix index dd6cffb979c5..8c1aac4d83b2 100644 --- a/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/pkgs/development/ocaml-modules/cstruct/default.nix @@ -1,5 +1,5 @@ -{ stdenv, writeText, fetchFromGitHub, ocaml, ocplib-endian, sexplib_p4, findlib, ppx_tools -, async_p4 ? null, lwt ? null, camlp4 +{ stdenv, writeText, fetchFromGitHub, ocaml, ocplib-endian, sexplib, findlib, ppx_tools +, async ? null, lwt ? null }: assert stdenv.lib.versionAtLeast ocaml.version "4.01"; @@ -22,10 +22,10 @@ stdenv.mkDerivation { inherit (param) sha256; }; - configureFlags = [ "${opt lwt}-lwt" "${opt async_p4}-async" "${opt ppx_tools}-ppx" ]; + configureFlags = [ "${opt lwt}-lwt" "${opt async}-async" "${opt ppx_tools}-ppx" ]; - buildInputs = [ ocaml findlib ppx_tools camlp4 lwt async_p4 ]; - propagatedBuildInputs = [ ocplib-endian sexplib_p4 ]; + buildInputs = [ ocaml findlib ppx_tools lwt async ]; + propagatedBuildInputs = [ ocplib-endian sexplib ]; createFindlibDestdir = true; dontStrip = true; |