diff options
| author | Peter Simons <simons@cryp.to> | 2015-06-16 12:11:26 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-06-16 12:48:50 +0200 |
| commit | ccd6988b3d4226be2a516945d5b459146c6678da (patch) | |
| tree | fd02f6358674439012c237413c3d4c98b009bb27 /pkgs/development/r-modules | |
| parent | 8ac6350ce77a73559ca7e0b53c1c042a92432af9 (diff) | |
| download | nixlib-ccd6988b3d4226be2a516945d5b459146c6678da.tar nixlib-ccd6988b3d4226be2a516945d5b459146c6678da.tar.gz nixlib-ccd6988b3d4226be2a516945d5b459146c6678da.tar.bz2 nixlib-ccd6988b3d4226be2a516945d5b459146c6678da.tar.lz nixlib-ccd6988b3d4226be2a516945d5b459146c6678da.tar.xz nixlib-ccd6988b3d4226be2a516945d5b459146c6678da.tar.zst nixlib-ccd6988b3d4226be2a516945d5b459146c6678da.zip | |
r-modules: fix xml2
Diffstat (limited to 'pkgs/development/r-modules')
| -rw-r--r-- | pkgs/development/r-modules/default.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 00565e0905d3..283e38bd80bc 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -325,6 +325,7 @@ let VBmix = [ pkgs.gsl pkgs.fftw pkgs.qt4 ]; WhopGenome = [ pkgs.zlib ]; XBRL = [ pkgs.zlib pkgs.libxml2 ]; + xml2 = [ pkgs.libxml2 ]; XML = [ pkgs.libtool pkgs.libxml2 pkgs.xmlsec pkgs.libxslt ]; }; @@ -1215,7 +1216,6 @@ let "WideLM" # depends on proprietary cudatoolkit "x_ent" # requires opencpu "xergm" # requires nlopt - "xml2" # build is broken "ZeligMultilevel" # Requires Nlopt "zetadiv" # requires nlopt "zoib" # tarball is invalid on server @@ -1223,10 +1223,7 @@ let otherOverrides = old: new: { xml2 = old.xml2.overrideDerivation (attrs: { - preConfigure = '' - export LIBXML_INCDIR=${pkgs.libxml2}/include/libxml2 - export LIBXML_LIBDIR=${pkgs.libxml2}/lib - ''; + preConfigure = "export LIBXML_INCDIR=${pkgs.libxml2}/include/libxml2"; }); curl = old.curl.overrideDerivation (attrs: { |