diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-04-18 21:31:56 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-04-18 21:31:56 +0200 |
commit | 7716b78fc7330a88e1d5bfd31158294c2f9103ae (patch) | |
tree | 8802eed03d1bca6ecab225ca8fac3f30e5dc8d5e /pkgs/development/libraries/pixman | |
parent | b37b73a56c26d1d77acefdaf66fce580c73e3149 (diff) | |
download | nixpkgs-7716b78fc7330a88e1d5bfd31158294c2f9103ae.tar nixpkgs-7716b78fc7330a88e1d5bfd31158294c2f9103ae.tar.gz nixpkgs-7716b78fc7330a88e1d5bfd31158294c2f9103ae.tar.bz2 nixpkgs-7716b78fc7330a88e1d5bfd31158294c2f9103ae.tar.lz nixpkgs-7716b78fc7330a88e1d5bfd31158294c2f9103ae.tar.xz nixpkgs-7716b78fc7330a88e1d5bfd31158294c2f9103ae.tar.zst nixpkgs-7716b78fc7330a88e1d5bfd31158294c2f9103ae.zip |
pixman: use pixman_cairo for xorg, flatten its includes
Diffstat (limited to 'pkgs/development/libraries/pixman')
-rw-r--r-- | pkgs/development/libraries/pixman/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index fd12ceb9fe8..7fbcedda395 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, perl }: +{ fetchurl, stdenv, pkgconfig, perl, withPNG ? true, libpng, glib /*just passthru*/ }: stdenv.mkDerivation rec { name = "pixman-0.28.2"; @@ -8,7 +8,11 @@ stdenv.mkDerivation rec { sha256 = "0mcvxd5gx3w1wzgph91l2vaiic91jmx7s01hi2igphyvd80ckyia"; }; - buildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkgconfig perl ]; + + buildInputs = stdenv.lib.optional withPNG [ libpng ]; # NOT in closure anyway + + postInstall = glib.flattenInclude; meta = { homepage = http://pixman.org; |