summary refs log tree commit diff
path: root/pkgs/development/libraries
diff options
context:
space:
mode:
authorWill Dietz <github@wdtz.org>2018-11-02 03:56:41 -0500
committerGitHub <noreply@github.com>2018-11-02 03:56:41 -0500
commit9e23f72ce7382b03a00ff8bc13a6f3d45ac7abf3 (patch)
tree9118e8646e7ba0a29f6f720a4e8aee5f8f436451 /pkgs/development/libraries
parent71bde96d2bed4ffb3289109836ae9298aa4ebcc7 (diff)
parent5ace2703096f16fa924072f3743d6eaac35bec32 (diff)
downloadnixlib-9e23f72ce7382b03a00ff8bc13a6f3d45ac7abf3.tar
nixlib-9e23f72ce7382b03a00ff8bc13a6f3d45ac7abf3.tar.gz
nixlib-9e23f72ce7382b03a00ff8bc13a6f3d45ac7abf3.tar.bz2
nixlib-9e23f72ce7382b03a00ff8bc13a6f3d45ac7abf3.tar.lz
nixlib-9e23f72ce7382b03a00ff8bc13a6f3d45ac7abf3.tar.xz
nixlib-9e23f72ce7382b03a00ff8bc13a6f3d45ac7abf3.tar.zst
nixlib-9e23f72ce7382b03a00ff8bc13a6f3d45ac7abf3.zip
Merge pull request #49548 from dtzWill/update/c-ares-1.15.0
c-ares: 1.14.0 -> 1.15.0
Diffstat (limited to 'pkgs/development/libraries')
-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 099d02c82639..efe7a5820b53 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";