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

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

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-04-16 19:47:59 +03:00 committed by Vladimír Čunát
parent 5e5c5382f6
commit e28e010b36
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/composable-derivation.nix
View File

@ -50,7 +50,7 @@ let inherit (lib) nv nvs; in
# nice features: # nice features:
# declaring "optional featuers" is modular. For instance: # declaring "optional featuers" is modular. For instance:
# flags.curl = { # flags.curl = {
# configureFlags = ["--with-curl=${curl}" "--with-curlwrappers"]; # configureFlags = ["--with-curl=${curl.dev}" "--with-curlwrappers"];
# buildInputs = [curl openssl]; # buildInputs = [curl openssl];
# }; # };
# flags.other = { .. } # flags.other = { .. }

2
pkgs/development/interpreters/php/default.nix
View File

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

2
pkgs/development/tools/vagrant/default.nix
View File

@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
# curl: curl, curl-config # curl: curl, curl-config
rm opt/vagrant/embedded/bin/{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}/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 # libarchive: bsdtar, bsdcpio
rm opt/vagrant/embedded/bin/{bsdtar,bsdcpio} rm opt/vagrant/embedded/bin/{bsdtar,bsdcpio}

2
pkgs/tools/security/clamav/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
"--with-xml=${libxml2}" "--with-xml=${libxml2}"
"--with-openssl=${openssl}" "--with-openssl=${openssl}"
"--with-libncurses-prefix=${ncurses}" "--with-libncurses-prefix=${ncurses}"
"--with-libcurl=${curl}" "--with-libcurl=${curl.dev}"
"--with-pcre=${pcre}" "--with-pcre=${pcre}"
"--enable-milter" "--enable-milter"
"--disable-clamav" "--disable-clamav"

2
pkgs/tools/security/modsecurity/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--enable-standalone-module" "--enable-standalone-module"
"--enable-static" "--enable-static"
"--with-curl=${curl}" "--with-curl=${curl.dev}"
"--with-apxs=${apacheHttpd.dev}/bin/apxs" "--with-apxs=${apacheHttpd.dev}/bin/apxs"
"--with-pcre=${pcre}" "--with-pcre=${pcre}"
"--with-apr=${apr.dev}" "--with-apr=${apr.dev}"

2
pkgs/top-level/python-packages.nix
View File

@ -7122,7 +7122,7 @@ in modules // {
USE_NCCONFIG="0"; USE_NCCONFIG="0";
HDF5_DIR="${pkgs.hdf5}"; HDF5_DIR="${pkgs.hdf5}";
NETCDF4_DIR="${pkgs.netcdf}"; NETCDF4_DIR="${pkgs.netcdf}";
CURL_DIR="${pkgs.curl}"; CURL_DIR="${pkgs.curl.dev}";
JPEG_DIR="${pkgs.libjpeg}"; JPEG_DIR="${pkgs.libjpeg}";
meta = { meta = {