diff options
| -rw-r--r-- | lib/composable-derivation.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/interpreters/php/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/vagrant/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/security/clamav/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/security/modsecurity/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/lib/composable-derivation.nix b/lib/composable-derivation.nix index 8e8faae39824..e3e017d982d3 100644 --- a/lib/composable-derivation.nix +++ b/lib/composable-derivation.nix @@ -50,7 +50,7 @@ let inherit (lib) nv nvs; in # nice features: # declaring "optional featuers" is modular. For instance: # flags.curl = { - # configureFlags = ["--with-curl=${curl}" "--with-curlwrappers"]; + # configureFlags = ["--with-curl=${curl.dev}" "--with-curlwrappers"]; # buildInputs = [curl openssl]; # }; # flags.other = { .. } diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 7466abeaf827..257329b881ec 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -60,7 +60,7 @@ let }; curl = { - configureFlags = ["--with-curl=${curl}"]; + configureFlags = ["--with-curl=${curl.dev}"]; buildInputs = [curl openssl]; }; diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 2284c25cf661..c970b319a94d 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { # curl: curl, curl-config rm opt/vagrant/embedded/bin/{curl,curl-config} ln -s ${curl.bin}/bin/curl opt/vagrant/embedded/bin - ln -s ${curl}/bin/curl-config opt/vagrant/embedded/bin + ln -s ${curl.dev}/bin/curl-config opt/vagrant/embedded/bin # libarchive: bsdtar, bsdcpio rm opt/vagrant/embedded/bin/{bsdtar,bsdcpio} diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index b76168e68ed0..b77b5e831123 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "--with-xml=${libxml2}" "--with-openssl=${openssl}" "--with-libncurses-prefix=${ncurses}" - "--with-libcurl=${curl}" + "--with-libcurl=${curl.dev}" "--with-pcre=${pcre}" "--enable-milter" "--disable-clamav" diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/tools/security/modsecurity/default.nix index 95d3f8ce396a..e82d34cb9ae6 100644 --- a/pkgs/tools/security/modsecurity/default.nix +++ b/pkgs/tools/security/modsecurity/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-standalone-module" "--enable-static" - "--with-curl=${curl}" + "--with-curl=${curl.dev}" "--with-apxs=${apacheHttpd.dev}/bin/apxs" "--with-pcre=${pcre}" "--with-apr=${apr.dev}" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a3d4856034b3..da1fbef80dfd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7122,7 +7122,7 @@ in modules // { USE_NCCONFIG="0"; HDF5_DIR="${pkgs.hdf5}"; NETCDF4_DIR="${pkgs.netcdf}"; - CURL_DIR="${pkgs.curl}"; + CURL_DIR="${pkgs.curl.dev}"; JPEG_DIR="${pkgs.libjpeg}"; meta = { |