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

bap: build with llvm_8

Browse Source
This commit is contained in:
Franz Pletz 2019-09-03 21:26:27 +02:00
parent e7b6d8790f
commit bd85a832c1
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchurl { stdenv, fetchFromGitHub, fetchurl
, ocaml, findlib, ocamlbuild, ocaml_oasis, , 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, 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, utop, libxml2,
ppx_tools_versioned, ppx_tools_versioned,
which, makeWrapper, writeText which, makeWrapper, writeText
}: }:
@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ which makeWrapper ]; nativeBuildInputs = [ which makeWrapper ];
buildInputs = [ ocaml findlib ocamlbuild ocaml_oasis buildInputs = [ ocaml findlib ocamlbuild ocaml_oasis
llvm_38 ppx_tools_versioned llvm ppx_tools_versioned
utop ]; utop libxml2 ];
propagatedBuildInputs = [ bitstring camlzip cmdliner ppx_jane core_kernel ezjsonm fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi parsexp propagatedBuildInputs = [ bitstring camlzip cmdliner ppx_jane core_kernel ezjsonm fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi parsexp
piqi-ocaml uuidm frontc ounit ]; piqi-ocaml uuidm frontc ounit ];
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
disableIda = "--disable-ida --disable-fsi-benchmark"; 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)"; BAPBUILDFLAGS = "-j $(NIX_BUILD_CORES)";

4
pkgs/top-level/ocaml-packages.nix
View File

@ -57,7 +57,9 @@ let
base64 = callPackage ../development/ocaml-modules/base64 { }; 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 { }; batteries = callPackage ../development/ocaml-modules/batteries { };