dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

r-modules: fix xml2

Browse Source
This commit is contained in:
Peter Simons 2015-06-16 12:11:26 +02:00
parent 8ac6350ce7
commit ccd6988b3d
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/r-modules/default.nix
View File

@ -325,6 +325,7 @@ let
VBmix = [ pkgs.gsl pkgs.fftw pkgs.qt4 ]; VBmix = [ pkgs.gsl pkgs.fftw pkgs.qt4 ];
WhopGenome = [ pkgs.zlib ]; WhopGenome = [ pkgs.zlib ];
XBRL = [ pkgs.zlib pkgs.libxml2 ]; XBRL = [ pkgs.zlib pkgs.libxml2 ];
xml2 = [ pkgs.libxml2 ];
XML = [ pkgs.libtool pkgs.libxml2 pkgs.xmlsec pkgs.libxslt ]; XML = [ pkgs.libtool pkgs.libxml2 pkgs.xmlsec pkgs.libxslt ];
}; };
@ -1215,7 +1216,6 @@ let
"WideLM" # depends on proprietary cudatoolkit "WideLM" # depends on proprietary cudatoolkit
"x_ent" # requires opencpu "x_ent" # requires opencpu
"xergm" # requires nlopt "xergm" # requires nlopt
"xml2" # build is broken
"ZeligMultilevel" # Requires Nlopt "ZeligMultilevel" # Requires Nlopt
"zetadiv" # requires nlopt "zetadiv" # requires nlopt
"zoib" # tarball is invalid on server "zoib" # tarball is invalid on server
@ -1223,10 +1223,7 @@ let
otherOverrides = old: new: { otherOverrides = old: new: {
xml2 = old.xml2.overrideDerivation (attrs: { xml2 = old.xml2.overrideDerivation (attrs: {
preConfigure = '' preConfigure = "export LIBXML_INCDIR=${pkgs.libxml2}/include/libxml2";
export LIBXML_INCDIR=${pkgs.libxml2}/include/libxml2
export LIBXML_LIBDIR=${pkgs.libxml2}/lib
'';
}); });
curl = old.curl.overrideDerivation (attrs: { curl = old.curl.overrideDerivation (attrs: {