public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ocamlPackages.bap: fix build with re-1.7.3

Browse Source
This commit is contained in:
Vincent Laporte 2018-06-24 12:59:48 +00:00
parent ea7c74c772
commit 3e60af02d3
No known key found for this signature in database
GPG Key ID: EBD582ADDDB1F81F
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/ocaml-modules/bap/default.nix
View File

@ -1,10 +1,12 @@
{stdenv, buildOcaml, fetchFromGitHub, fetchurl, camlp4, ocaml_oasis, { stdenv, fetchFromGitHub, fetchurl, fetchpatch
, ocaml, findlib, ocamlbuild, ocaml_oasis,
bitstring, camlzip, cmdliner, core_kernel, ezjsonm, faillib, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, ulex, easy-format, xmlm, frontc, ounit, ppx_jane, parsexp, bitstring, camlzip, cmdliner, core_kernel, ezjsonm, faillib, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, ulex, easy-format, xmlm, frontc, ounit, ppx_jane, parsexp,
utop, utop,
which, makeWrapper, writeText, ocaml}: which, makeWrapper, writeText
}:
buildOcaml rec { stdenv.mkDerivation rec {
name = "bap"; name = "ocaml${ocaml.version}-bap-${version}";
version = "1.4.0"; version = "1.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "BinaryAnalysisPlatform"; owner = "BinaryAnalysisPlatform";
@ -18,6 +20,11 @@ buildOcaml rec {
sha256 = "0k761w82zkmi5dwsfqq61dbjnb8mmmpb2xwp7vp85xs14g5fjz19"; sha256 = "0k761w82zkmi5dwsfqq61dbjnb8mmmpb2xwp7vp85xs14g5fjz19";
}; };
patches = [(fetchpatch {
url = "https://github.com/BinaryAnalysisPlatform/bap/commit/e4ee3a1e5b427e8d8991e7462b06123178c0a046.patch";
sha256 = "1yq33zd2sdacclr20g05c1q050m7x7vfbl66qdgansh23dr4fnxk";
})];
createFindlibDestdir = true; createFindlibDestdir = true;
setupHook = writeText "setupHook.sh" '' setupHook = writeText "setupHook.sh" ''
@ -27,7 +34,7 @@ buildOcaml rec {
nativeBuildInputs = [ which makeWrapper ]; nativeBuildInputs = [ which makeWrapper ];
buildInputs = [ ocaml_oasis buildInputs = [ ocaml findlib ocamlbuild ocaml_oasis
llvm_38 llvm_38
utop ]; utop ];