treewide: Make explicit that 'dev' output of curl is used

wip/yesman
Tuomas Tynkkynen 8 years ago committed by Vladimír Čunát
parent 5e5c5382f6
commit e28e010b36
  1. 2
      lib/composable-derivation.nix
  2. 2
      pkgs/development/interpreters/php/default.nix
  3. 2
      pkgs/development/tools/vagrant/default.nix
  4. 2
      pkgs/tools/security/clamav/default.nix
  5. 2
      pkgs/tools/security/modsecurity/default.nix
  6. 2
      pkgs/top-level/python-packages.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 = { .. }

@ -60,7 +60,7 @@ let
};
curl = {
configureFlags = ["--with-curl=${curl}"];
configureFlags = ["--with-curl=${curl.dev}"];
buildInputs = [curl openssl];
};

@ -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}

@ -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"

@ -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}"

@ -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 = {

Loading…
Cancel
Save