diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2019-09-03 21:25:23 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2019-09-03 21:25:23 +0200 |
| commit | e7b6d8790f5fbef4743b2a922e6dc84d6c757590 (patch) | |
| tree | ff3d09c2c92823cd07795ce2c1335ebc10ed8158 /pkgs | |
| parent | e3434a3c36354328edae4893424fc313c96684b8 (diff) | |
| download | nixpkgs-e7b6d8790f5fbef4743b2a922e6dc84d6c757590.tar nixpkgs-e7b6d8790f5fbef4743b2a922e6dc84d6c757590.tar.gz nixpkgs-e7b6d8790f5fbef4743b2a922e6dc84d6c757590.tar.bz2 nixpkgs-e7b6d8790f5fbef4743b2a922e6dc84d6c757590.tar.lz nixpkgs-e7b6d8790f5fbef4743b2a922e6dc84d6c757590.tar.xz nixpkgs-e7b6d8790f5fbef4743b2a922e6dc84d6c757590.tar.zst nixpkgs-e7b6d8790f5fbef4743b2a922e6dc84d6c757590.zip | |
ocamlPackages.llvm: build with llvm_8
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/ocaml-modules/llvm/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/development/ocaml-modules/llvm/default.nix b/pkgs/development/ocaml-modules/llvm/default.nix index 3bced92cc3e..0dd8231dafe 100644 --- a/pkgs/development/ocaml-modules/llvm/default.nix +++ b/pkgs/development/ocaml-modules/llvm/default.nix @@ -10,18 +10,20 @@ stdenv.mkDerivation { buildInputs = [ python cmake llvm ocaml findlib ctypes ]; patches = [ (fetchpatch { - url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/llvm/llvm.3.9/files/cmake.patch; - sha256 = "1fcc6ylfiw1npdhx7mrsj7h0dx7cym7i9664kpr76zqazb52ikm9"; + url = https://raw.githubusercontent.com/ocaml/opam-repository/2bdc193f5a9305ea93bf0f0dfc1fbc327c8b9306/packages/llvm/llvm.7.0.0/files/fix-shared.patch; + sha256 = "1p98j3b1vrryfn1xa7i50m6mmm4dyw5ldafq6kyh9sfmdihz4zsx"; })]; - cmakeFlags = [ "-DLLVM_OCAML_OUT_OF_TREE=TRUE" ]; + cmakeFlags = [ + "-DLLVM_OCAML_OUT_OF_TREE=TRUE" + "-DLLVM_OCAML_INSTALL_PATH=${placeholder "out"}/ocaml" + ]; buildFlags = "ocaml_all"; installFlags = "-C bindings/ocaml"; postInstall = '' - mv $out/lib/ocaml $out/ocaml mkdir -p $OCAMLFIND_DESTDIR/ mv $out/ocaml $OCAMLFIND_DESTDIR/llvm mv $OCAMLFIND_DESTDIR/llvm/META{.llvm,} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 16dd32a8a7a..ac4bd45a5d2 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -391,7 +391,7 @@ let linenoise = callPackage ../development/ocaml-modules/linenoise { }; llvm = callPackage ../development/ocaml-modules/llvm { - llvm = pkgs.llvm_39; + llvm = pkgs.llvm_8; }; logs = callPackage ../development/ocaml-modules/logs { |