diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2019-09-03 21:26:27 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2019-09-03 21:26:27 +0200 |
| commit | bd85a832c1261113fd69898f4f60e4fad990bfc5 (patch) | |
| tree | 37dd9782873e055eacad104e73e5a2cdbc863ec0 | |
| parent | e7b6d8790f5fbef4743b2a922e6dc84d6c757590 (diff) | |
| download | nixlib-bd85a832c1261113fd69898f4f60e4fad990bfc5.tar nixlib-bd85a832c1261113fd69898f4f60e4fad990bfc5.tar.gz nixlib-bd85a832c1261113fd69898f4f60e4fad990bfc5.tar.bz2 nixlib-bd85a832c1261113fd69898f4f60e4fad990bfc5.tar.lz nixlib-bd85a832c1261113fd69898f4f60e4fad990bfc5.tar.xz nixlib-bd85a832c1261113fd69898f4f60e4fad990bfc5.tar.zst nixlib-bd85a832c1261113fd69898f4f60e4fad990bfc5.zip | |
bap: build with llvm_8
| -rw-r--r-- | pkgs/development/ocaml-modules/bap/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index 30e3687676ab..5ddb9a462242 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchurl , ocaml, findlib, ocamlbuild, ocaml_oasis, - bitstring, camlzip, cmdliner, core_kernel, ezjsonm, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, frontc, ounit, ppx_jane, parsexp, - utop, + bitstring, camlzip, cmdliner, core_kernel, ezjsonm, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm, frontc, ounit, ppx_jane, parsexp, + utop, libxml2, ppx_tools_versioned, which, makeWrapper, writeText }: @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which makeWrapper ]; buildInputs = [ ocaml findlib ocamlbuild ocaml_oasis - llvm_38 ppx_tools_versioned - utop ]; + llvm ppx_tools_versioned + utop libxml2 ]; propagatedBuildInputs = [ bitstring camlzip cmdliner ppx_jane core_kernel ezjsonm fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi parsexp piqi-ocaml uuidm frontc ounit ]; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { disableIda = "--disable-ida --disable-fsi-benchmark"; - configureFlags = [ "--enable-everything ${disableIda}" "--with-llvm-config=${llvm_38}/bin/llvm-config" ]; + configureFlags = [ "--enable-everything ${disableIda}" "--with-llvm-config=${llvm}/bin/llvm-config" ]; BAPBUILDFLAGS = "-j $(NIX_BUILD_CORES)"; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index ac4bd45a5d2b..b7eb250710a3 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -57,7 +57,9 @@ let base64 = callPackage ../development/ocaml-modules/base64 { }; - bap = callPackage ../development/ocaml-modules/bap { }; + bap = callPackage ../development/ocaml-modules/bap { + llvm = pkgs.llvm_8; + }; batteries = callPackage ../development/ocaml-modules/batteries { }; |