summary refs log tree commit diff
path: root/pkgs/development/ocaml-modules/cstruct
diff options
context:
space:
mode:
authorMatthew Maurer <matthew.r.maurer@gmail.com>2016-09-14 16:34:33 -0400
committerMatthew Maurer <matthew.r.maurer@gmail.com>2016-09-14 16:37:21 -0400
commit1d0e6ba2df81ad5d9fa42c9181da945a8b1abae3 (patch)
tree812fb7251bbb3e1209c2893e394f372481fb0215 /pkgs/development/ocaml-modules/cstruct
parent32367919c4e8dad0983034a1bb716e709267fd75 (diff)
downloadnixpkgs-1d0e6ba2df81ad5d9fa42c9181da945a8b1abae3.tar
nixpkgs-1d0e6ba2df81ad5d9fa42c9181da945a8b1abae3.tar.gz
nixpkgs-1d0e6ba2df81ad5d9fa42c9181da945a8b1abae3.tar.bz2
nixpkgs-1d0e6ba2df81ad5d9fa42c9181da945a8b1abae3.tar.lz
nixpkgs-1d0e6ba2df81ad5d9fa42c9181da945a8b1abae3.tar.xz
nixpkgs-1d0e6ba2df81ad5d9fa42c9181da945a8b1abae3.tar.zst
nixpkgs-1d0e6ba2df81ad5d9fa42c9181da945a8b1abae3.zip
async: 112.24.00 -> 112.24.00/113.33.03
PPX/P4 split
Diffstat (limited to 'pkgs/development/ocaml-modules/cstruct')
-rw-r--r--pkgs/development/ocaml-modules/cstruct/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix
index 68b202f9ade..c9f04918d17 100644
--- a/pkgs/development/ocaml-modules/cstruct/default.nix
+++ b/pkgs/development/ocaml-modules/cstruct/default.nix
@@ -1,5 +1,5 @@
 {stdenv, writeText, fetchurl, ocaml, ocplib-endian, sexplib_p4, findlib,
- async ? null, lwt ? null, camlp4}:
+ async_p4 ? null, lwt ? null, camlp4}:
 
 assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01";
 
@@ -12,9 +12,9 @@ stdenv.mkDerivation {
   };
 
   configureFlags = stdenv.lib.strings.concatStringsSep " " ((if lwt != null then ["--enable-lwt"] else []) ++
-                                          (if async != null then ["--enable-async"] else []));
+                                          (if async_p4 != null then ["--enable-async"] else []));
   buildInputs = [ocaml findlib camlp4];
-  propagatedBuildInputs = [ocplib-endian sexplib_p4 lwt async];
+  propagatedBuildInputs = [ocplib-endian sexplib_p4 lwt async_p4];
 
   createFindlibDestdir = true;
   dontStrip = true;