ocamlPackages.bap: fix for multiple outputs llvmPackages
7869d1654517c028aa76fc1dedc9b5ac301a867a split all packages in
llvmPackages into multiple outputs. The default output of llvm doesn't
contain llvm-config, so we need to explicitly choose llvm.dev here.
commit2d3225a6c274b1d79a9b8d762e62f63e6c55c45a
authorsternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
dateTue 18 May 2021, 00:29 (6 years ago)
parent252da55
pkgs/development/ocaml-modules/bap/default.nix+1−1
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
6868 substituteInPlace oasis/elf-loader --replace bitstring.ppx ppx_bitstring
6969 '';
7070
71− configureFlags = [ "--enable-everything ${disableIda}" "--with-llvm-config=${llvm}/bin/llvm-config" ];
71+ configureFlags = [ "--enable-everything ${disableIda}" "--with-llvm-config=${llvm.dev}/bin/llvm-config" ];
7272
7373 meta = with lib; {
7474 description = "Platform for binary analysis. It is written in OCaml, but can be used from other languages.";
pkgs/top-level/ocaml-packages.nix+1−1
@@ -53,7 +53,7 @@ let
5353 base64 = callPackage ../development/ocaml-modules/base64 { };
5454
5555 bap = callPackage ../development/ocaml-modules/bap {
56− llvm = pkgs.llvm_8;
56+ inherit (pkgs.llvmPackages_8) llvm;
5757 };
5858
5959 batteries = callPackage ../development/ocaml-modules/batteries { };