Merge remote-tracking branch 'upstream/master' into hardened-stdenv

pkgs/development/libraries/gd/default.nix

@@ -8,31 +8,23 @@
 , libXpm ? null
 , fontconfig
 , freetype
-, fetchpatch, autoreconfHook, perl
 }:
 
 stdenv.mkDerivation rec {
   name = "gd-${version}";
-  version = "2.2.2";
+  version = "2.2.3";
 
   src = fetchurl {
     url = "https://github.com/libgd/libgd/releases/download/${name}/libgd-${version}.tar.xz";
-    sha256 = "1311g5mva2xlzqv3rjqjc4jjkn5lzls4skvr395h633zw1n7b7s8";
+    sha256 = "0g3xz8jpz1pl2zzmssglrpa9nxiaa7rmcmvgpbrjz8k9cyynqsvl";
   };
 
   hardeningDisable = [ "format" ];
 
-  # Address an incompatibility with Darwin's libtool
-  patches = stdenv.lib.optional stdenv.isDarwin (fetchpatch {
-    url = https://github.com/libgd/libgd/commit/502e4cd873c3b37b307b9f450ef827d40916c3d6.patch;
-    sha256 = "0gawr2c4zr6cljnwzhdlxhz2mkbg0r5vzvr79dv6yf6fcj06awfs";
-  });
-
   # -pthread gets passed to clang, causing warnings
   configureFlags = stdenv.lib.optional stdenv.isDarwin "--enable-werror=no";
 
-  nativeBuildInputs = [ pkgconfig ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ autoreconfHook perl ];
+  nativeBuildInputs = [ pkgconfig ];
 
   buildInputs = [ zlib fontconfig freetype ];
   propagatedBuildInputs = [ libpng libjpeg libwebp libtiff libXpm ];