about summary refs log tree commit diff
path: root/pkgs/development/r-modules
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2015-06-16 12:01:43 +0200
committerPeter Simons <simons@cryp.to>2015-06-16 12:48:50 +0200
commit9fc5317055059cbad38a3163805d39838668721c (patch)
treeaa38dd8c6bb423c0c49e63dd4b66dc0ec7a91bb3 /pkgs/development/r-modules
parentd4c810cccda570df54adcc51329f07dca69db65a (diff)
downloadnixlib-9fc5317055059cbad38a3163805d39838668721c.tar
nixlib-9fc5317055059cbad38a3163805d39838668721c.tar.gz
nixlib-9fc5317055059cbad38a3163805d39838668721c.tar.bz2
nixlib-9fc5317055059cbad38a3163805d39838668721c.tar.lz
nixlib-9fc5317055059cbad38a3163805d39838668721c.tar.xz
nixlib-9fc5317055059cbad38a3163805d39838668721c.tar.zst
nixlib-9fc5317055059cbad38a3163805d39838668721c.zip
r-modules: fix curl
Diffstat (limited to 'pkgs/development/r-modules')
-rw-r--r--pkgs/development/r-modules/default.nix5
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 34e50d08413d..d2ef6f5daa85 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -216,7 +216,7 @@ let
     CARramps = [ pkgs.linuxPackages.nvidia_x11 pkgs.liblapack ];
     chebpol = [ pkgs.fftw ];
     cit = [ pkgs.gsl ];
-    curl = [ pkgs.curl pkgs.openldap ];
+    curl = [ pkgs.curl ];
     devEMF = [ pkgs.xlibs.libXft ];
     diversitree = [ pkgs.gsl pkgs.fftw ];
     EMCluster = [ pkgs.liblapack ];
@@ -737,7 +737,6 @@ let
     "Crossover" # fails self-test
     "CrypticIBDcheck" # requires rJPSGCS
     "cudaBayesreg" # requres Rmath
-    "curl" # build is broken
     "curvHDR" # requires flowCore
     "D2C" # requires gRbase
     "DAAGbio" # requires limma
@@ -1230,7 +1229,7 @@ let
     });
 
     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: {