summary refs log tree commit diff
path: root/pkgs/development/libraries/c-ares
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2018-11-02 14:36:29 +0100
committerVladimír Čunát <vcunat@gmail.com>2018-11-02 14:40:55 +0100
commit4dd0482aa9893f7f4fd39104a6306ef6a6d3106c (patch)
tree18da2ac42762af2d732295e9d4f06a3d099cefae /pkgs/development/libraries/c-ares
parenta92a2c8e158c1a67486e17063d04e448f25b865c (diff)
downloadnixpkgs-4dd0482aa9893f7f4fd39104a6306ef6a6d3106c.tar
nixpkgs-4dd0482aa9893f7f4fd39104a6306ef6a6d3106c.tar.gz
nixpkgs-4dd0482aa9893f7f4fd39104a6306ef6a6d3106c.tar.bz2
nixpkgs-4dd0482aa9893f7f4fd39104a6306ef6a6d3106c.tar.lz
nixpkgs-4dd0482aa9893f7f4fd39104a6306ef6a6d3106c.tar.xz
nixpkgs-4dd0482aa9893f7f4fd39104a6306ef6a6d3106c.tar.zst
nixpkgs-4dd0482aa9893f7f4fd39104a6306ef6a6d3106c.zip
Re-revert "c-ares: 1.14.0 -> 1.15.0"
This reverts commit 87e4e1ba72dafd0ea1208cd959d047c04612b4aa
It's a mass rebuild, moving from master.  /cc #49548
Diffstat (limited to 'pkgs/development/libraries/c-ares')
-rw-r--r--pkgs/development/libraries/c-ares/default.nix15
1 files changed, 3 insertions, 12 deletions
diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix
index 099d02c8263..efe7a5820b5 100644
--- a/pkgs/development/libraries/c-ares/default.nix
+++ b/pkgs/development/libraries/c-ares/default.nix
@@ -2,23 +2,14 @@
 
 let self =
 stdenv.mkDerivation rec {
-  name = "c-ares-1.14.0";
+  name = "c-ares-1.15.0";
 
   src = fetchurl {
     url = "https://c-ares.haxx.se/download/${name}.tar.gz";
-    sha256 = "0vnwmbvymw677k780kpb6sb8i3szdp89rzy8mz1fwg1657yw3ls5";
+    sha256 = "0lk8knip4xk6qzksdkn7085mmgm4ixfczdyyjw656c193y3rgnvc";
   };
 
-  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;
+  configureFlags = stdenv.lib.optionals stdenv.hostPlatform.isWindows [ "--disable-shared" "--enable-static" ];
 
   meta = with stdenv.lib; {
     description = "A C library for asynchronous DNS requests";