diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-11 14:55:52 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-11 14:55:52 +0200 |
| commit | ee6894ca1297afe0caf2f389c1f9a9220826b749 (patch) | |
| tree | 02f96b5744cef8bc55010fb8301f5b50c0748d4c /pkgs/development/libraries/cairo/default.nix | |
| parent | 392874b9b1411dc7b879997bd8776b921feea61d (diff) | |
| parent | 617c26df84d5670574864a9ccad0eaf8708bd86a (diff) | |
| download | nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.gz nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.bz2 nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.lz nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.xz nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.zst nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.zip | |
Merge staging into master
Diffstat (limited to 'pkgs/development/libraries/cairo/default.nix')
| -rw-r--r-- | pkgs/development/libraries/cairo/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 6aa184e4204e..6a7beb1cc1a8 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig, libiconv -, libintlOrEmpty, expat, zlib, libpng, pixman, fontconfig, freetype, xorg +, libintl, expat, zlib, libpng, pixman, fontconfig, freetype, xorg , gobjectSupport ? true, glib , xcbSupport ? true # no longer experimental since 1.12 , glSupport ? true, libGL ? null # libGLU_combined is no longer a big dependency @@ -34,7 +34,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libiconv - ] ++ libintlOrEmpty ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + libintl + ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreGraphics CoreText ApplicationServices |