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

r-modules: fix curl

Browse Source
This commit is contained in:
Peter Simons 2015-06-16 12:01:43 +02:00
parent d4c810cccd
commit 9fc5317055
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -216,7 +216,7 @@ let
CARramps = [ pkgs.linuxPackages.nvidia_x11 pkgs.liblapack ]; CARramps = [ pkgs.linuxPackages.nvidia_x11 pkgs.liblapack ];
chebpol = [ pkgs.fftw ]; chebpol = [ pkgs.fftw ];
cit = [ pkgs.gsl ]; cit = [ pkgs.gsl ];
curl = [ pkgs.curl pkgs.openldap ]; curl = [ pkgs.curl ];
devEMF = [ pkgs.xlibs.libXft ]; devEMF = [ pkgs.xlibs.libXft ];
diversitree = [ pkgs.gsl pkgs.fftw ]; diversitree = [ pkgs.gsl pkgs.fftw ];
EMCluster = [ pkgs.liblapack ]; EMCluster = [ pkgs.liblapack ];
@ -737,7 +737,6 @@ let
"Crossover" # fails self-test "Crossover" # fails self-test
"CrypticIBDcheck" # requires rJPSGCS "CrypticIBDcheck" # requires rJPSGCS
"cudaBayesreg" # requres Rmath "cudaBayesreg" # requres Rmath
"curl" # build is broken
"curvHDR" # requires flowCore "curvHDR" # requires flowCore
"D2C" # requires gRbase "D2C" # requires gRbase
"DAAGbio" # requires limma "DAAGbio" # requires limma
@ -1230,7 +1229,7 @@ let
}); });
curl = old.curl.overrideDerivation (attrs: { curl = old.curl.overrideDerivation (attrs: {
preConfigure = "export CURL_INCLUDES=${pkgs.curl}/include/curl"; preConfigure = "export CURL_INCLUDES=${pkgs.curl}/include";
}); });
iFes = old.iFes.overrideDerivation (attrs: { iFes = old.iFes.overrideDerivation (attrs: {