diff options
| author | vbgl <vbgl@users.noreply.github.com> | 2016-04-21 10:48:47 +0200 |
|---|---|---|
| committer | vbgl <vbgl@users.noreply.github.com> | 2016-04-21 10:48:47 +0200 |
| commit | f53e097b01e6a75dae2f491ce7722fdced3828a7 (patch) | |
| tree | 0191497b8cd5f497a7a87ec5e762c92115106cc8 /pkgs | |
| parent | dfb370ce5f3ba81ec04f5ccb4a3e3730e3c07929 (diff) | |
| parent | f3536f8ca0d6e609fb7a73c546d5f0d88a023759 (diff) | |
| download | nixlib-f53e097b01e6a75dae2f491ce7722fdced3828a7.tar nixlib-f53e097b01e6a75dae2f491ce7722fdced3828a7.tar.gz nixlib-f53e097b01e6a75dae2f491ce7722fdced3828a7.tar.bz2 nixlib-f53e097b01e6a75dae2f491ce7722fdced3828a7.tar.lz nixlib-f53e097b01e6a75dae2f491ce7722fdced3828a7.tar.xz nixlib-f53e097b01e6a75dae2f491ce7722fdced3828a7.tar.zst nixlib-f53e097b01e6a75dae2f491ce7722fdced3828a7.zip | |
Merge pull request #14826 from vbgl/cairo-xlib-on-darwin
cairo: build cairo-xlib even on Darwin
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/cairo/default.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 2e4821b30738..f6f0a0d3af72 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -32,8 +32,7 @@ stdenv.mkDerivation rec { ]); propagatedBuildInputs = - with xorg; [ libXext fontconfig expat freetype pixman zlib libpng ] - ++ optional (!stdenv.isDarwin) libXrender + with xorg; [ libXext fontconfig expat freetype pixman zlib libpng libXrender ] ++ optionals xcbSupport [ libxcb xcbutil ] ++ optional gobjectSupport glib ++ optional glSupport mesa_noglu |