diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-09-08 00:46:04 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-09-16 22:13:21 +0000 |
| commit | afcf2d55332c5c01c2d989e9d010577d257cb6cc (patch) | |
| tree | e1c816a271686b014a6403bcad7c57dd2ee4d9c7 /nixpkgs/pkgs/development/ocaml-modules/nocrypto | |
| parent | 175b9acd282aaf65b5f354ea6e95c1348fe3daa3 (diff) | |
| parent | 4e60699fa727e4a0f9a3e78948012f86da32cfef (diff) | |
| download | nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.gz nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.bz2 nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.lz nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.xz nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.zst nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.zip | |
Merge commit '4e60699fa727e4a0f9a3e78948012f86da32cfef'
Diffstat (limited to 'nixpkgs/pkgs/development/ocaml-modules/nocrypto')
| -rw-r--r-- | nixpkgs/pkgs/development/ocaml-modules/nocrypto/default.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/ocaml-modules/nocrypto/default.nix b/nixpkgs/pkgs/development/ocaml-modules/nocrypto/default.nix index 813b4d7f7a4a..9108fd248c01 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, topkg -, cpuid, ocb-stubblr +, cpuid, ocb-stubblr, sexplib , cstruct, zarith, ppx_sexp_conv , cstruct-lwt ? null }: @@ -33,10 +33,18 @@ stdenv.mkDerivation rec { url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0004-pack-package-workaround-ocamlbuild-272.patch"; sha256 = "16k0w78plvqhl17qiqq1mckxhhcdysqgs94l54a1bn0l6fx3rvb9"; }) + (fetchpatch { + url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0005-use-modern-cstruct-findlib.patch"; + sha256 = "021k38zbdidw6g7j4vjxlnbsrnzq07bnavxzdjq23nbwlifs2nq9"; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0006-explicit-dependency-on-sexplib.patch"; + sha256 = "15kd0qgi96yxr3qkmaqny591l0s6qmwpprxd5xdx9qwv72hq813z"; + }) ]; buildInputs = [ ocaml findlib ocamlbuild topkg cpuid ocb-stubblr ]; - propagatedBuildInputs = [ cstruct ppx_sexp_conv zarith ] ++ optional withLwt cstruct-lwt; + propagatedBuildInputs = [ cstruct ppx_sexp_conv sexplib zarith ] ++ optional withLwt cstruct-lwt; buildPhase = "${topkg.buildPhase} --with-lwt ${boolToString withLwt}"; inherit (topkg) installPhase; |