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

Merge remote-tracking branch 'upstream/gcc-8' into staging-next

Browse Source 
Earlier the gcc8 branch was merged instead of the gcc-8 branch (note the dash)...
This commit is contained in:
Frederik Rietdijk
2019-09-08 20:44:26 +02:00
parent ccc8c73ea0 e7297363c9
commit 5f4734b1dd
70 changed files with 275 additions and 659 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/ocaml-modules/bap/default.nix
View File

@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchurl
, ocaml, findlib, ocamlbuild, ocaml_oasis,
bitstring, camlzip, cmdliner, core_kernel, ezjsonm, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, frontc, ounit, ppx_jane, parsexp,
utop,
bitstring, camlzip, cmdliner, core_kernel, ezjsonm, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm, frontc, ounit, ppx_jane, parsexp,
utop, libxml2,
ppx_tools_versioned,
which, makeWrapper, writeText
}:
@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ which makeWrapper ];
buildInputs = [ ocaml findlib ocamlbuild ocaml_oasis
llvm_38 ppx_tools_versioned
utop ];
llvm ppx_tools_versioned
utop libxml2 ];
propagatedBuildInputs = [ bitstring camlzip cmdliner ppx_jane core_kernel ezjsonm fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi parsexp
piqi-ocaml uuidm frontc ounit ];
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
disableIda = "--disable-ida --disable-fsi-benchmark";
configureFlags = [ "--enable-everything ${disableIda}" "--with-llvm-config=${llvm_38}/bin/llvm-config" ];
configureFlags = [ "--enable-everything ${disableIda}" "--with-llvm-config=${llvm}/bin/llvm-config" ];
BAPBUILDFLAGS = "-j $(NIX_BUILD_CORES)";

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

@@ -11,18 +11,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,}