cairo: drop modifications

I don't need to disable any Cairo features, and upstream is switching
to Meson, so won't be interested in these patches.

1 files changed, 17 insertions, 39 deletions

diff --git a/nixpkgs/pkgs/development/libraries/cairo/default.nix b/nixpkgs/pkgs/development/libraries/cairo/default.nix
index f3b631c892be..f922a7ed2e9f 100644
--- a/nixpkgs/pkgs/development/libraries/cairo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cairo/default.nix
@@ -1,26 +1,20 @@
-{ config, lib, stdenv, fetchurl, fetchpatch, pkg-config, autoreconfHook, gtk-doc
-, pixman
-, zlibSupport ? true, zlib
-, pngSupport ? true, libpng
-, freetypeSupport ? true, freetype
-, fontconfigSupport ? freetypeSupport, fontconfig
+{ config, lib, stdenv, fetchurl, fetchpatch, pkg-config, libiconv
+, libintl, expat, zlib, libpng, pixman, fontconfig, freetype
+, x11Support? !stdenv.isDarwin, libXext, libXrender
 , gobjectSupport ? true, glib
-, x11Support ? !stdenv.isDarwin, libX11, libXext
-, x11XrenderSupport ? x11Support, libXrender
-, xcbSupport ? !stdenv.isDarwin, libxcb # no longer experimental since 1.12
+, xcbSupport ? x11Support, libxcb, xcbutil # no longer experimental since 1.12
 , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
 , glSupport ? x11Support && config.cairo.gl or (libGLSupported && stdenv.isLinux)
 , libGL ? null # libGLU libGL is no longer a big dependency
+, pdfSupport ? true
 , darwin
 }:
 
-assert fontconfigSupport -> freetypeSupport;
-assert x11XrenderSupport -> x11Support;
 assert glSupport -> x11Support && libGL != null;
 
 let
   version = "1.16.0";
-  inherit (lib) enableFeature optional optionals;
+  inherit (lib) optional optionals;
 in stdenv.mkDerivation rec {
   pname = "cairo";
   inherit version;
@@ -49,11 +43,6 @@ in stdenv.mkDerivation rec {
       sha256 = "yCwsDUY7efVvOZkA6a0bPS+RrVc8Yk9bfPwWHeOjq5o=";
     })
 
-    ./0001-test-don-t-always-build-FreeType-dependent-test.patch
-    ./0002-gl-don-t-implicitly-include-X11-headers.patch
-    ./0003-test-only-build-GL-tests-when-Xlib-is-enabled.patch
-    ./0004-util-don-t-build-cairo-sphinx-unless-PNG-enabled.patch
-
     # Fixes CVE-2020-35492; see https://github.com/NixOS/nixpkgs/issues/120364.
     # CVE information: https://nvd.nist.gov/vuln/detail/CVE-2020-35492
     # Upstream PR: https://gitlab.freedesktop.org/cairo/cairo/merge_requests/85
@@ -89,27 +78,22 @@ in stdenv.mkDerivation rec {
   separateDebugInfo = true;
 
   nativeBuildInputs = [
-    autoreconfHook
-    gtk-doc
     pkg-config
   ];
 
-  buildInputs = optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+  buildInputs = [
+    libiconv
+    libintl
+  ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
     CoreGraphics
     CoreText
     ApplicationServices
     Carbon
   ]);
 
-  propagatedBuildInputs =
-    [ pixman ]
-    ++ optional zlibSupport zlib
-    ++ optional pngSupport libpng
-    ++ optionals x11Support [ libX11 libXext ]
-    ++ optional x11XrenderSupport libXrender
-    ++ optional xcbSupport libxcb
-    ++ optional freetypeSupport freetype
-    ++ optional fontconfigSupport fontconfig
+  propagatedBuildInputs = [ fontconfig expat freetype pixman zlib libpng ]
+    ++ optionals x11Support [ libXext libXrender ]
+    ++ optionals xcbSupport [ libxcb xcbutil ]
     ++ optional gobjectSupport glib
     ++ optional glSupport libGL
     ; # TODO: maybe liblzo but what would it be for here?
@@ -122,16 +106,10 @@ in stdenv.mkDerivation rec {
     "--enable-quartz-font"
     "--enable-quartz-image"
     "--enable-ft"
-  ] else [
-    (enableFeature zlibSupport "script")
-    (enableFeature zlibSupport "ps")
-    (enableFeature zlibSupport "pdf")
-    (enableFeature zlibSupport "interpreter")
-    (enableFeature pngSupport "png")
-    (enableFeature pngSupport "svg")
-    (enableFeature glSupport "gl")
-    (enableFeature x11Support "xlib")
-  ]);
+  ] else (optional xcbSupport "--enable-xcb"
+    ++ optional glSupport "--enable-gl"
+    ++ optional pdfSupport "--enable-pdf"
+  )) ++ optional (!x11Support) "--disable-xlib";
 
   preConfigure =
   # On FreeBSD, `-ldl' doesn't exist.