forked from mirrors/nixpkgs
pixman: use pixman_cairo for xorg, flatten its includes
This commit is contained in:
parent
b37b73a56c
commit
7716b78fc7
|
@ -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;
|
||||
|
|
|
@ -7,6 +7,8 @@ let
|
|||
|
||||
xorg = rec {
|
||||
|
||||
inherit pixman;
|
||||
|
||||
applewmproto = (stdenv.mkDerivation ((if overrides ? applewmproto then overrides.applewmproto else x: x) {
|
||||
name = "applewmproto-1.4.2";
|
||||
builder = ./builder.sh;
|
||||
|
|
|
@ -5669,6 +5669,7 @@ let
|
|||
xkeyboard_config dbus libuuid openssl gperf m4
|
||||
autoconf libtool xmlto asciidoc udev flex bison python mtdev;
|
||||
automake = automake110x;
|
||||
pixman = pixman_cairo;
|
||||
});
|
||||
|
||||
xorgReplacements = callPackage ../servers/x11/xorg/replacements.nix { };
|
||||
|
|
Loading…
Reference in a new issue