cairo: clean up

1 files changed, 18 insertions, 19 deletions

diff --git a/nixpkgs/pkgs/development/libraries/cairo/default.nix b/nixpkgs/pkgs/development/libraries/cairo/default.nix
index a0d4eccae943..b86d68638c23 100644
--- a/nixpkgs/pkgs/development/libraries/cairo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cairo/default.nix
@@ -1,4 +1,4 @@
-{ config, stdenv, fetchurl, fetchpatch, pkgconfig, autoreconfHook
+{ config, stdenv, lib, fetchurl, fetchpatch, pkgconfig, autoreconfHook
 , pixman, xorg
 , zlibSupport ? true, zlib
 , pngSupport ? true, libpng
@@ -20,12 +20,12 @@ assert glSupport -> libGL != null;
 
 let
   version = "1.16.0";
-  inherit (stdenv.lib) optional optionals;
+  inherit (lib) enableFeature optional optionals;
 in stdenv.mkDerivation rec {
   name = "cairo-${version}";
 
   src = fetchurl {
-    url = "https://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${name}.tar.xz";
+    url = "https://cairographics.org/${if lib.mod (builtins.fromJSON (lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${name}.tar.xz";
     sha256 = "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy";
   };
 
@@ -64,11 +64,11 @@ in stdenv.mkDerivation rec {
   ]);
 
   propagatedBuildInputs =
-    with xorg; [ pixman ]
+    [ pixman ]
     ++ optional zlibSupport zlib
     ++ optional pngSupport libpng
-    ++ optionals xlibSupport [ libX11 libXext ]
-    ++ optional xlibXrenderSupport libXrender
+    ++ optionals xlibSupport (with xorg; [ libX11 libXext ])
+    ++ optional xlibXrenderSupport xorg.libXrender
     ++ optional xcbSupport xorg.libxcb
     ++ optional freetypeSupport freetype
     ++ optional fontconfigSupport fontconfig
@@ -82,17 +82,16 @@ in stdenv.mkDerivation rec {
     "--enable-quartz-font"
     "--enable-quartz-image"
     "--enable-ft"
-  ] else ([ "--enable-tee" ]
-    ++ optionals (!zlibSupport) [
-      "--disable-script"
-      "--disable-ps"
-      "--disable-pdf"
-      "--disable-interpreter"
-    ]
-    ++ optionals (!pngSupport) [ "--disable-png" "--disable-svg" ]
-    ++ optional xcbSupport "--enable-xcb"
-    ++ optional glSupport "--enable-gl"
-  );
+  ] else [
+    (enableFeature zlibSupport "script")
+    (enableFeature zlibSupport "ps")
+    (enableFeature zlibSupport "pdf")
+    (enableFeature zlibSupport "interpreter")
+    (enableFeature pngSupport "png")
+    (enableFeature pngSupport "svg")
+    "--enable-tee"
+    (enableFeature glSupport "gl")
+  ];
 
   preConfigure =
   # On FreeBSD, `-ldl' doesn't exist.
@@ -115,9 +114,9 @@ in stdenv.mkDerivation rec {
 
   doCheck = false; # fails
 
-  postInstall = stdenv.lib.optionalString stdenv.isDarwin glib.flattenInclude;
+  postInstall = lib.optionalString stdenv.isDarwin glib.flattenInclude;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A 2D graphics library with support for multiple output devices";
 
     longDescription = ''