diff options
| author | Pamplemousse <xav.maso@gmail.com> | 2021-01-08 15:18:14 -0700 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2021-01-11 09:35:54 +0100 |
| commit | 9ff73686ed0127d9cc65633053e6d7a554ff179a (patch) | |
| tree | ef6c8833002e822876034ebdabddd732571af9dc /pkgs/development/ocaml-modules | |
| parent | c7f5dcbb212709b851b5609000a2b780fd05a588 (diff) | |
| download | nixlib-9ff73686ed0127d9cc65633053e6d7a554ff179a.tar nixlib-9ff73686ed0127d9cc65633053e6d7a554ff179a.tar.gz nixlib-9ff73686ed0127d9cc65633053e6d7a554ff179a.tar.bz2 nixlib-9ff73686ed0127d9cc65633053e6d7a554ff179a.tar.lz nixlib-9ff73686ed0127d9cc65633053e6d7a554ff179a.tar.xz nixlib-9ff73686ed0127d9cc65633053e6d7a554ff179a.tar.zst nixlib-9ff73686ed0127d9cc65633053e6d7a554ff179a.zip | |
ocamlPackages.bap: Correct build dependencies
As pointed upstream: https://github.com/BinaryAnalysisPlatform/bap/issues/1261#issuecomment-754926500 Signed-off-by: Pamplemousse <xav.maso@gmail.com>
Diffstat (limited to 'pkgs/development/ocaml-modules')
| -rw-r--r-- | pkgs/development/ocaml-modules/bap/curses_is_ncurses.patch (renamed from pkgs/development/ocaml-modules/bap/dont-add-curses.patch) | 2 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/bap/default.nix | 18 |
2 files changed, 9 insertions, 11 deletions
diff --git a/pkgs/development/ocaml-modules/bap/dont-add-curses.patch b/pkgs/development/ocaml-modules/bap/curses_is_ncurses.patch index 438a1bfc6dc0..0b012848601f 100644 --- a/pkgs/development/ocaml-modules/bap/dont-add-curses.patch +++ b/pkgs/development/ocaml-modules/bap/curses_is_ncurses.patch @@ -23,7 +23,7 @@ index 966c407..fba3fb4 100644 Bap_llvm_ogre_types CCOpt: $cc_optimization - CCLib: $llvm_lib $cxxlibs $llvm_ldflags -lcurses -+ CCLib: $llvm_lib $cxxlibs $llvm_ldflags ++ CCLib: $llvm_lib $cxxlibs $llvm_ldflags -lncurses CSources: llvm_disasm.h, llvm_disasm.c, llvm_stubs.c, diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index e860ad13d405..9cb0859cedc8 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -1,10 +1,10 @@ { 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, frontc, ounit, ppx_jane, parsexp, - utop, libxml2, - ppx_bitstring, - ppx_tools_versioned, - which, makeWrapper, writeText +, ocaml, findlib, ocamlbuild, ocaml_oasis +, 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, ncurses +, ppx_bitstring +, ppx_tools_versioned +, which, makeWrapper, writeText , z3 }: @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ocamlbuild ocaml_oasis llvm ppx_bitstring ppx_tools_versioned z3 - utop libxml2 ]; + utop libxml2 ncurses ]; propagatedBuildInputs = [ bitstring camlzip cmdliner ppx_jane core_kernel ezjsonm fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi parsexp piqi-ocaml uuidm frontc ounit ]; @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { disableIda = "--disable-ida"; - patches = [ ./dont-add-curses.patch ]; + patches = [ ./curses_is_ncurses.patch ]; preConfigure = '' substituteInPlace oasis/elf --replace bitstring.ppx ppx_bitstring @@ -70,8 +70,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-everything ${disableIda}" "--with-llvm-config=${llvm}/bin/llvm-config" ]; - BAPBUILDFLAGS = "-j $(NIX_BUILD_CORES)"; - meta = with stdenv.lib; { description = "Platform for binary analysis. It is written in OCaml, but can be used from other languages."; homepage = "https://github.com/BinaryAnalysisPlatform/bap/"; |