From 2d3225a6c274b1d79a9b8d762e62f63e6c55c45a Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 18 May 2021 00:29:15 +0200 Subject: [PATCH] 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. --- pkgs/development/ocaml-modules/bap/default.nix | 2 +- pkgs/top-level/ocaml-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index 94f254a2edf..c1cb7de2d18 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { substituteInPlace oasis/elf-loader --replace bitstring.ppx ppx_bitstring ''; - configureFlags = [ "--enable-everything ${disableIda}" "--with-llvm-config=${llvm}/bin/llvm-config" ]; + configureFlags = [ "--enable-everything ${disableIda}" "--with-llvm-config=${llvm.dev}/bin/llvm-config" ]; meta = with lib; { description = "Platform for binary analysis. It is written in OCaml, but can be used from other languages."; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index e6815abf43c..b58fe1f4294 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -53,7 +53,7 @@ let base64 = callPackage ../development/ocaml-modules/base64 { }; bap = callPackage ../development/ocaml-modules/bap { - llvm = pkgs.llvm_8; + inherit (pkgs.llvmPackages_8) llvm; }; batteries = callPackage ../development/ocaml-modules/batteries { };