curl: split into multiple outputs

Also use pkgconfig to be safer and fix (some) referrers.
nixos-19.03
Vladimír Čunát 7 years ago
parent e71c9cfaa2
commit 99e4371526
  1. 4
      nixos/modules/services/continuous-integration/jenkins/default.nix
  2. 2
      nixos/modules/services/databases/influxdb.nix
  3. 2
      nixos/modules/services/misc/docker-registry.nix
  4. 2
      nixos/modules/services/monitoring/cadvisor.nix
  5. 2
      nixos/modules/services/networking/i2pd.nix
  6. 2
      nixos/modules/services/search/elasticsearch.nix
  7. 2
      nixos/tests/cadvisor.nix
  8. 2
      pkgs/applications/altcoins/bitcoin-xt.nix
  9. 10
      pkgs/applications/video/kodi/default.nix
  10. 2
      pkgs/applications/virtualization/nova/default.nix
  11. 6
      pkgs/applications/window-managers/awesome/default.nix
  12. 2
      pkgs/development/interpreters/elixir/default.nix
  13. 2
      pkgs/development/r-modules/default.nix
  14. 2
      pkgs/development/tools/vagrant/default.nix
  15. 2
      pkgs/games/minetest/default.nix
  16. 6
      pkgs/games/xonotic/default.nix
  17. 6
      pkgs/stdenv/darwin/make-bootstrap-tools.nix
  18. 6
      pkgs/stdenv/pure-darwin/make-bootstrap-tools.nix
  19. 2
      pkgs/test/openftd/default.nix
  20. 2
      pkgs/tools/misc/debian-devscripts/default.nix
  21. 2
      pkgs/tools/misc/pipelight/default.nix
  22. 2
      pkgs/tools/misc/plowshare/default.nix
  23. 10
      pkgs/tools/networking/curl/default.nix
  24. 2
      pkgs/tools/security/prey/default.nix
  25. 2
      pkgs/tools/virtualization/aws/default.nix

@ -117,11 +117,11 @@ in {
'';
postStart = ''
until ${pkgs.curl}/bin/curl -s -L localhost:${toString cfg.port} ; do
until ${pkgs.curl.bin}/bin/curl -s -L localhost:${toString cfg.port} ; do
sleep 10
done
while true ; do
index=`${pkgs.curl}/bin/curl -s -L localhost:${toString cfg.port}`
index=`${pkgs.curl.bin}/bin/curl -s -L localhost:${toString cfg.port}`
if [[ !("$index" =~ 'Please wait while Jenkins is restarting' ||
"$index" =~ 'Please wait while Jenkins is getting ready to work') ]]; then
exit 0

@ -225,7 +225,7 @@ in
if [ "$(id -u)" = 0 ]; then chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}; fi
'';
postStart = mkBefore ''
until ${pkgs.curl}/bin/curl -s -o /dev/null 'http://${cfg.bindAddress}:${toString cfg.apiPort}/'; do
until ${pkgs.curl.bin}/bin/curl -s -o /dev/null 'http://${cfg.bindAddress}:${toString cfg.apiPort}/'; do
sleep 1;
done
'';

@ -65,7 +65,7 @@ in {
};
postStart = ''
until ${pkgs.curl}/bin/curl -s -o /dev/null 'http://${cfg.host}:${toString cfg.port}/'; do
until ${pkgs.curl.bin}/bin/curl -s -o /dev/null 'http://${cfg.host}:${toString cfg.port}/'; do
sleep 1;
done
'';

@ -71,7 +71,7 @@ in {
after = [ "network.target" "docker.service" "influxdb.service" ];
postStart = mkBefore ''
until ${pkgs.curl}/bin/curl -s -o /dev/null 'http://${cfg.host}:${toString cfg.port}/containers/'; do
until ${pkgs.curl.bin}/bin/curl -s -o /dev/null 'http://${cfg.host}:${toString cfg.port}/containers/'; do
sleep 1;
done
'';

@ -8,7 +8,7 @@ let
homeDir = "/var/lib/i2pd";
extip = "EXTIP=\$(${pkgs.curl}/bin/curl -sf \"http://jsonip.com\" | ${pkgs.gawk}/bin/awk -F'\"' '{print $4}')";
extip = "EXTIP=\$(${pkgs.curl.bin}/bin/curl -sf \"http://jsonip.com\" | ${pkgs.gawk}/bin/awk -F'\"' '{print $4}')";
i2pSh = pkgs.writeScriptBin "i2pd" ''
#!/bin/sh

@ -142,7 +142,7 @@ in {
ln -s ${esPlugins}/plugins ${cfg.dataDir}/plugins
'';
postStart = mkBefore ''
until ${pkgs.curl}/bin/curl -s -o /dev/null ${cfg.host}:${toString cfg.port}; do
until ${pkgs.curl.bin}/bin/curl -s -o /dev/null ${cfg.host}:${toString cfg.port}; do
sleep 1
done
'';

@ -14,7 +14,7 @@ import ./make-test.nix ({ pkgs, ... } : {
services.cadvisor.storageDriver = "influxdb";
services.influxdb.enable = true;
systemd.services.influxdb.postStart = mkAfter ''
${pkgs.curl}/bin/curl -X POST 'http://localhost:8086/db?u=root&p=root' \
${pkgs.curl.bin}/bin/curl -X POST 'http://localhost:8086/db?u=root&p=root' \
-d '{"name": "root"}'
'';
};

@ -20,7 +20,7 @@ stdenv.mkDerivation rec{
configureFlags = [
"--with-boost-libdir=${boost.lib}/lib"
"--with-libcurl-headers=${curl}/include"
"--with-libcurl-headers=${curl.dev}/include"
] ++ optionals withGui [ "--with-gui=qt4" ];
meta = {

@ -104,13 +104,9 @@ in stdenv.mkDerivation rec {
--prefix PATH ":" "${pythonFull}/bin" \
--prefix PATH ":" "${glxinfo}/bin" \
--prefix PATH ":" "${xdpyinfo}/bin" \
--prefix LD_LIBRARY_PATH ":" "${curl}/lib" \
--prefix LD_LIBRARY_PATH ":" "${systemd}/lib" \
--prefix LD_LIBRARY_PATH ":" "${libmad}/lib" \
--prefix LD_LIBRARY_PATH ":" "${libvdpau}/lib" \
--prefix LD_LIBRARY_PATH ":" "${libcec}/lib" \
--prefix LD_LIBRARY_PATH ":" "${libcec_platform}/lib" \
--prefix LD_LIBRARY_PATH ":" "${rtmpdump}/lib"
--prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath
[ curl systemd libmad libvdpau libcec libcec_platform rtmpdump ]
}"
done
'';

@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
sed -i nova/flags.py \
-e "/DEFINE.*'state_path'/ s|../|/var/lib/nova|"
substituteInPlace nova/virt/images.py --replace /usr/bin/curl ${curl}/bin/curl
substituteInPlace nova/virt/images.py --replace /usr/bin/curl ${curl.bin}/bin/curl
substituteInPlace nova/api/ec2/cloud.py \
--replace 'sh genrootca.sh' $out/libexec/nova/genrootca.sh

@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
#cmakeFlags = "-DGENERATE_MANPAGES=ON";
LD_LIBRARY_PATH = "${cairo}/lib:${pango}/lib:${gobjectIntrospection}/lib";
LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ cairo pango gobjectIntrospection ]}";
GI_TYPELIB_PATH = "${pango}/lib/girepository-1.0";
LUA_CPATH = "${lgi}/lib/lua/${lua.luaversion}/?.so";
LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua";
@ -70,8 +70,8 @@ stdenv.mkDerivation rec {
--prefix LUA_CPATH ";" '"${lgi}/lib/lua/${lua.luaversion}/?.so"' \
--prefix LUA_PATH ";" '"${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"' \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix LD_LIBRARY_PATH : "${cairo}/lib:${pango}/lib:${gobjectIntrospection}/lib" \
--prefix PATH : "${compton}/bin:${unclutter}/bin:${procps}/bin:${iproute}/sbin:${coreutils}/bin:${curl}/bin:${alsaUtils}/bin:${findutils}/bin:${xterm}/bin"
--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \
--prefix PATH : "${compton}/bin:${unclutter}/bin:${procps}/bin:${iproute}/sbin:${coreutils}/bin:${curl.bin}/bin:${alsaUtils}/bin:${findutils}/bin:${xterm}/bin"
wrapProgram $out/bin/awesome-client \
--prefix PATH : "${which}/bin"

@ -30,7 +30,7 @@ stdenv.mkDerivation {
b=$(basename $f)
if [ $b == "mix" ]; then continue; fi
wrapProgram $f \
--prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${curl}/bin:${bash}/bin" \
--prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${curl.bin}/bin:${bash}/bin" \
--set CURL_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt
done

@ -1562,7 +1562,7 @@ let
});
curl = old.curl.overrideDerivation (attrs: {
preConfigure = "export CURL_INCLUDES=${pkgs.curl}/include";
preConfigure = "export CURL_INCLUDES=${pkgs.curl.dev}/include";
});
iFes = old.iFes.overrideDerivation (attrs: {

@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
# curl: curl
rm opt/vagrant/embedded/bin/curl
ln -s ${curl}/bin/curl opt/vagrant/embedded/bin
ln -s ${curl.bin}/bin/curl opt/vagrant/embedded/bin
# libarchive: bsdtar, bsdcpio
rm opt/vagrant/embedded/bin/{bsdtar,bsdcpio}

@ -25,7 +25,7 @@ in stdenv.mkDerivation {
cmakeFlags = [
"-DENABLE_FREETYPE=1"
"-DENABLE_GETTEXT=1"
"-DCURL_INCLUDE_DIR=${curl}/include/curl"
"-DCURL_INCLUDE_DIR=${curl.dev}/include/curl"
"-DIRRLICHT_INCLUDE_DIR=${irrlicht}/include/irrlicht"
];

@ -32,9 +32,9 @@ stdenv.mkDerivation rec {
#'';
NIX_LDFLAGS = ''
-rpath ${zlib}/lib
-rpath ${libvorbis}/lib
-rpath ${curl}/lib
-rpath ${zlib.out}/lib
-rpath ${libvorbis.out}/lib
-rpath ${curl.out}/lib
'';
buildPhase = ''

@ -56,9 +56,9 @@ rec {
# This used to be in-nixpkgs, but now is in the bundle
# because I can't be bothered to make it partially static
cp ${curl}/bin/curl $out/bin
cp -d ${curl}/lib/libcurl*.dylib $out/lib
cp -d ${libssh2}/lib/libssh*.dylib $out/lib
cp ${curl.bin}/bin/curl $out/bin
cp -d ${curl.out}/lib/libcurl*.dylib $out/lib
cp -d ${libssh2.out}/lib/libssh*.dylib $out/lib
cp -d ${openssl.out}/lib/*.dylib $out/lib
cp -d ${gnugrep.pcre.out}/lib/libpcre*.dylib $out/lib

@ -56,9 +56,9 @@ rec {
# This used to be in-nixpkgs, but now is in the bundle
# because I can't be bothered to make it partially static
cp ${curl}/bin/curl $out/bin
cp -d ${curl}/lib/libcurl*.dylib $out/lib
cp -d ${libssh2}/lib/libssh*.dylib $out/lib
cp ${curl.bin}/bin/curl $out/bin
cp -d ${curl.out}/lib/libcurl*.dylib $out/lib
cp -d ${libssh2.out}/lib/libssh*.dylib $out/lib
cp -d ${openssl.out}/lib/*.dylib $out/lib
cp -d ${gnugrep.pcre.out}/lib/libpcre*.dylib $out/lib

@ -45,5 +45,5 @@ stdenv.mkDerivation {
glib gtk pkgconfig dbus_glib realCurl pcre libsexy libgnomeui gtkspell libnotify libgtkhtml
];
configureFlags="--with-libcurl-libraries=${curl}/lib --with-libcurl-headers=${curl}/include --with-pcre_libraries=${pcre}/lib --with-pcre_headers=${pcre}/include";
configureFlags="--with-libcurl-libraries=${curl.out}/lib --with-libcurl-headers=${curl.dev}/include --with-pcre_libraries=${pcre.out}/lib --with-pcre_headers=${pcre.dev}/include";
}

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
-e "s@/usr/(s|)bin/sendmail@${sendmailPath}@g" \
-e "s@/usr/bin/diff@${diffutils}/bin/diff@g" \
-e "s@/usr/bin/gpgv(2|)@${gnupg}/bin/gpgv2@g" \
-e "s@(command -v|/usr/bin/)curl@${curl}/bin/curl@g" \
-e "s@(command -v|/usr/bin/)curl@${curl.bin}/bin/curl@g" \
-i {} +
sed -e "s@/usr/share/sgml/[^ ]*/manpages/docbook.xsl@${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl@" -i scripts/Makefile
sed -r \

@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
--wine-path=${wine_custom} \
--gpg-exec=${gnupg}/bin/gpg2 \
--bash-interp=${bash}/bin/bash \
--downloader=${curl}/bin/curl
--downloader=${curl.bin}/bin/curl
$configureFlags
'';

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
make PREFIX="$out" install
for fn in plow{del,down,list,up}; do
wrapProgram "$out/bin/$fn" --prefix PATH : "${curl}/bin:${spidermonkey}/bin"
wrapProgram "$out/bin/$fn" --prefix PATH : "${curl.bin}/bin:${spidermonkey.bin}/bin"
done
'';

@ -1,4 +1,4 @@
{ stdenv, fetchurl
{ stdenv, fetchurl, pkgconfig
, idnSupport ? false, libidn ? null
, ldapSupport ? false, openldap ? null
, zlibSupport ? false, zlib ? null
@ -23,6 +23,9 @@ stdenv.mkDerivation rec {
sha256 = "050q6i20lbh7dyyhva2sbp8dbyp6sghlkbpvq2bvcasqwsx4298y";
};
outputs = [ "dev" "out" "bin" "doc" ]; # man3 is "dev-doc"
nativeBuildInputs = [ pkgconfig ];
# Zlib and OpenSSL must be propagated because `libcurl.la' contains
# "-lz -lssl", which aren't necessary direct build inputs of
# applications that use Curl.
@ -59,6 +62,11 @@ stdenv.mkDerivation rec {
CXX = "g++";
CXXCPP = "g++ -E";
postInstall = ''
_moveToOutput bin/curl-config "$dev"
sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la
'';
crossAttrs = {
# We should refer to the cross built openssl
# For the 'urandom', maybe it should be a cross-system option

@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
cp -R . $out
cp -R ${modulesSrc}/* $out/modules/
wrapProgram "$out/prey.sh" \
--prefix PATH ":" "${xawtv}/bin:${imagemagick}/bin:${curl}/bin:${scrot}/bin:${inetutils}/bin:${coreutils}/bin" \
--prefix PATH ":" "${xawtv}/bin:${imagemagick}/bin:${curl.bin}/bin:${scrot}/bin:${inetutils}/bin:${coreutils}/bin" \
--set CURL_CA_BUNDLE "/etc/ssl/certs/ca-certificates.crt"
'';

@ -15,7 +15,7 @@ stdenv.mkDerivation {
installPhase =
''
mkdir -p $out/bin
sed 's|\[curl|[${curl}/bin/curl|g' $src > $out/bin/aws
sed 's|\[curl|[${curl.bin}/bin/curl|g' $src > $out/bin/aws
chmod +x $out/bin/aws
'';

Loading…
Cancel
Save