about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/libraries/cairo
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2019-04-22 13:24:57 +0000
committerAlyssa Ross <hi@alyssa.is>2019-04-23 10:14:28 +0000
commit321e744230fd360e3362d1ddee565d66e39d0151 (patch)
tree72b2abc95c3eb50d435f7d193ac301e30333f2b5 /nixpkgs/pkgs/development/libraries/cairo
parent35cd31a9879309a57f499e3fd3c287d346c3aaff (diff)
downloadnixlib-321e744230fd360e3362d1ddee565d66e39d0151.tar
nixlib-321e744230fd360e3362d1ddee565d66e39d0151.tar.gz
nixlib-321e744230fd360e3362d1ddee565d66e39d0151.tar.bz2
nixlib-321e744230fd360e3362d1ddee565d66e39d0151.tar.lz
nixlib-321e744230fd360e3362d1ddee565d66e39d0151.tar.xz
nixlib-321e744230fd360e3362d1ddee565d66e39d0151.tar.zst
nixlib-321e744230fd360e3362d1ddee565d66e39d0151.zip
cairo: remove unused dependencies
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/cairo')
-rw-r--r--nixpkgs/pkgs/development/libraries/cairo/default.nix18
1 files changed, 8 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/development/libraries/cairo/default.nix b/nixpkgs/pkgs/development/libraries/cairo/default.nix
index cb93b224df40..a0d4eccae943 100644
--- a/nixpkgs/pkgs/development/libraries/cairo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cairo/default.nix
@@ -1,7 +1,7 @@
-{ config, stdenv, fetchurl, fetchpatch, pkgconfig, libiconv, autoreconfHook
-, libintl, expat, zlib, libpng, pixman, xorg
-, zlibSupport ? true
-, pngSupport ? true
+{ config, stdenv, fetchurl, fetchpatch, pkgconfig, autoreconfHook
+, pixman, xorg
+, zlibSupport ? true, zlib
+, pngSupport ? true, libpng
 , freetypeSupport ? true, freetype
 , fontconfigSupport ? freetypeSupport, fontconfig
 , gobjectSupport ? true, glib
@@ -53,12 +53,10 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoreconfHook
     pkgconfig
+    autoreconfHook
   ];
 
-  buildInputs = [
-    libiconv
-    libintl
-  ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+  buildInputs = optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
     CoreGraphics
     CoreText
     ApplicationServices
@@ -66,12 +64,12 @@ in stdenv.mkDerivation rec {
   ]);
 
   propagatedBuildInputs =
-    with xorg; [ expat pixman ]
+    with xorg; [ pixman ]
     ++ optional zlibSupport zlib
     ++ optional pngSupport libpng
     ++ optionals xlibSupport [ libX11 libXext ]
     ++ optional xlibXrenderSupport libXrender
-    ++ optionals xcbSupport [ libxcb xcbutil ]
+    ++ optional xcbSupport xorg.libxcb
     ++ optional freetypeSupport freetype
     ++ optional fontconfigSupport fontconfig
     ++ optional gobjectSupport glib