Skip to content

ocamlPackages.{piqi,piqi-ocaml,bap}: fix build #159201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
symphorien merged 3 commits into from
Feb 11, 2022
Merged

ocamlPackages.{piqi,piqi-ocaml,bap}: fix build #159201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ef6295
ocamlPackages.piqi: fix build
vbgl Feb 11, 2022
d5050e3
ocamlPackages.piqi-ocaml: fix build
vbgl Feb 11, 2022
7b9b38f
ocamlPackages.bap: fix build
vbgl Feb 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pkgs/development/ocaml-modules/bap/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ stdenv.mkDerivation rec {
piqi-ocaml uuidm frontc yojson ];

installPhase = ''
runHook preInstall
export OCAMLPATH=$OCAMLPATH:$OCAMLFIND_DESTDIR;
export PATH=$PATH:$out/bin
export CAML_LD_LIBRARY_PATH=''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}$OCAMLFIND_DESTDIR/bap-plugin-llvm/:$OCAMLFIND_DESTDIR/bap/
Expand All @@ -58,6 +59,7 @@ stdenv.mkDerivation rec {
makeWrapper ${utop}/bin/utop $out/bin/baptop --prefix OCAMLPATH : $OCAMLPATH --prefix PATH : $PATH --add-flags "-ppx ppx-bap -short-paths -require \"bap.top\""
wrapProgram $out/bin/bapbuild --prefix OCAMLPATH : $OCAMLPATH --prefix PATH : $PATH
ln -s $sigs $out/share/bap/sigs.zip
runHook postInstall
'';

disableIda = "--disable-ida";
Expand Down
6 changes: 5 additions & 1 deletion pkgs/development/ocaml-modules/piqi-ocaml/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@ stdenv.mkDerivation rec {

createFindlibDestdir = true;

installPhase = "DESTDIR=$out make install";
installPhase = ''
runHook preInstall
DESTDIR=$out make install
runHook postInstall
'';

meta = with lib; {
homepage = "https://piqi.org";
Expand Down
12 changes: 3 additions & 9 deletions pkgs/development/ocaml-modules/piqi/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,9 @@ stdenv.mkDerivation rec {

createFindlibDestdir = true;

buildPhase = ''
make
make -C piqilib piqilib.cma
'';

installPhase = ''
make install;
make ocaml-install;
'';
postBuild = "make -C piqilib piqilib.cma";

installTargets = [ "install" "ocaml-install" ];

meta = with lib; {
homepage = "https://piqi.org";
Expand Down