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

ocamlPackages.bap: Correct build dependencies

Browse Source 
As pointed upstream:
  https://github.com/BinaryAnalysisPlatform/bap/issues/1261#issuecomment-754926500

Signed-off-by: Pamplemousse <xav.maso@gmail.com>
This commit is contained in:
Pamplemousse 2021-01-08 15:18:14 -07:00 committed by Vincent Laporte
parent c7f5dcbb21
commit 9ff73686ed
No known key found for this signature in database
GPG Key ID: EBD582ADDDB1F81F
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/ocaml-modules/bap/dont-add-curses.patch → pkgs/development/ocaml-modules/bap/curses_is_ncurses.patch
View File

@ -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,

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

@ -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/";