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

ocaml-llvm: 3.7.1 -> 3.9.1

Browse Source
This commit is contained in:
Vincent Laporte 2017-03-12 18:22:01 +00:00 committed by vbgl
parent b2c96062ca
commit b2b8a412fb
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/development/ocaml-modules/llvm/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, python, llvm, ocaml, findlib, ctypes }: { stdenv, fetchpatch, python, cmake, llvm, ocaml, findlib, ctypes }:
let version = stdenv.lib.getVersion llvm; in let version = stdenv.lib.getVersion llvm; in
@ -7,21 +7,23 @@ stdenv.mkDerivation {
inherit (llvm) src; inherit (llvm) src;
buildInputs = [ python llvm ocaml findlib ctypes ]; buildInputs = [ python cmake llvm ocaml findlib ctypes ];
configurePhase = '' patches = [ (fetchpatch {
mkdir build url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/llvm/llvm.3.9/files/cmake.patch;
cd build sha256 = "1fcc6ylfiw1npdhx7mrsj7h0dx7cym7i9664kpr76zqazb52ikm9";
../configure --disable-compiler-version-checks --prefix=$out \ })];
--disable-doxygen --disable-docs --with-ocaml-libdir=$OCAMLFIND_DESTDIR/llvm \
--enable-static
'';
enableParallelBuilding = false; cmakeFlags = [ "-DLLVM_OCAML_OUT_OF_TREE=TRUE" ];
makeFlags = [ "-C bindings" "SYSTEM_LLVM_CONFIG=llvm-config" ]; buildFlags = "ocaml_all";
installFlags = "-C bindings/ocaml";
postInstall = '' postInstall = ''
mv $out/lib/ocaml $out/ocaml
mkdir -p $OCAMLFIND_DESTDIR/
mv $out/ocaml $OCAMLFIND_DESTDIR/llvm
mv $OCAMLFIND_DESTDIR/llvm/META{.llvm,} mv $OCAMLFIND_DESTDIR/llvm/META{.llvm,}
''; '';

2
pkgs/top-level/ocaml-packages.nix
View File

@ -261,7 +261,7 @@ let
else lambdaTerm-1_6; else lambdaTerm-1_6;
llvm = callPackage ../development/ocaml-modules/llvm { llvm = callPackage ../development/ocaml-modules/llvm {
llvm = pkgs.llvm_37; llvm = pkgs.llvm_39;
}; };
logs = callPackage ../development/ocaml-modules/logs { logs = callPackage ../development/ocaml-modules/logs {