From 9fc5317055059cbad38a3163805d39838668721c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Jun 2015 12:01:43 +0200
Subject: [PATCH] r-modules: fix curl

---
 pkgs/development/r-modules/default.nix | 5 ++---
 1 file 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: {