M-Labs
/
HeavyX
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rustc: add libxml2 dep

This commit is contained in:
Sebastien Bourdeauducq 2019-04-07 00:45:02 +08:00
parent 0ef16ba90c
commit da982a60cc
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compilers/rust/rustc.nix
View File

@ -1,7 +1,7 @@
{ stdenv, targetPackages { stdenv, targetPackages
, fetchurl, fetchgit, fetchzip, file, python2, tzdata, ps , fetchurl, fetchgit, fetchzip, file, python2, tzdata, ps
, llvm, jemalloc, ncurses, darwin, rustPlatform, git, cmake, curl , llvm, ncurses, darwin, rustPlatform, git, cmake, curl
, which, libffi, gdb, zlib , which, libffi, gdb, zlib, libxml2
, version , version
, src , src
, configureFlags ? [] , configureFlags ? []
@ -53,7 +53,6 @@ stdenv.mkDerivation {
configureFlags = configureFlags configureFlags = configureFlags
++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" ] ++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" ]
++ [ "--enable-vendor" ] ++ [ "--enable-vendor" ]
# ++ [ "--jemalloc-root=${jemalloc}/lib"
++ [ "--default-linker=${targetPackages.stdenv.cc}/bin/cc" ] ++ [ "--default-linker=${targetPackages.stdenv.cc}/bin/cc" ]
++ optional (targets != []) "--target=${target}" ++ optional (targets != []) "--target=${target}"
++ [ "--llvm-root=${llvm}" ] ; ++ [ "--llvm-root=${llvm}" ] ;
@ -119,7 +118,7 @@ stdenv.mkDerivation {
# Only needed for the debuginfo tests # Only needed for the debuginfo tests
++ optional (!stdenv.isDarwin) gdb; ++ optional (!stdenv.isDarwin) gdb;
buildInputs = [ ncurses zlib ] ++ targetToolchains buildInputs = [ ncurses zlib libxml2 ] ++ targetToolchains
++ optional stdenv.isDarwin Security; ++ optional stdenv.isDarwin Security;
outputs = [ "out" "man" "doc" ]; outputs = [ "out" "man" "doc" ];