From 87e4e1ba72dafd0ea1208cd959d047c04612b4aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 2 Nov 2018 14:33:55 +0100 Subject: [PATCH] Revert "c-ares: 1.14.0 -> 1.15.0" This reverts commit 5ace2703096f16fa924072f3743d6eaac35bec32. It's a mass rebuild, moving to staging. --- pkgs/development/libraries/c-ares/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index efe7a5820b53..099d02c82639 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -2,14 +2,23 @@ let self = stdenv.mkDerivation rec { - name = "c-ares-1.15.0"; + name = "c-ares-1.14.0"; src = fetchurl { url = "https://c-ares.haxx.se/download/${name}.tar.gz"; - sha256 = "0lk8knip4xk6qzksdkn7085mmgm4ixfczdyyjw656c193y3rgnvc"; + sha256 = "0vnwmbvymw677k780kpb6sb8i3szdp89rzy8mz1fwg1657yw3ls5"; }; - configureFlags = stdenv.lib.optionals stdenv.hostPlatform.isWindows [ "--disable-shared" "--enable-static" ]; + configureFlags = if stdenv.hostPlatform.isWindows then [ "--disable-shared" "--enable-static" ] else null; + + # ares_android.h header is missing + # see issue https://github.com/c-ares/c-ares/issues/216 + postPatch = if stdenv.hostPlatform.isAndroid then '' + cp ${fetchurl { + url = "https://raw.githubusercontent.com/c-ares/c-ares/cares-1_14_0/ares_android.h"; + sha256 = "1aw8y6r5c8zq6grjwf4mcm2jj35r5kgdklrp296214s1f1827ps8"; + }} ares_android.h + '' else null; meta = with stdenv.lib; { description = "A C library for asynchronous DNS requests";