public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pixman: use pixman_cairo for xorg, flatten its includes

Browse Source
This commit is contained in:
Vladimír Čunát
2013-04-18 21:31:56 +02:00
parent b37b73a56c
commit 7716b78fc7
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/pixman/default.nix
+6 -2
View File
@@ -1,4 +1,4 @@
{ fetchurl, stdenv, pkgconfig, perl }: { fetchurl, stdenv, pkgconfig, perl, withPNG ? true, libpng, glib /*just passthru*/ }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pixman-0.28.2"; name = "pixman-0.28.2";
@@ -8,7 +8,11 @@ stdenv.mkDerivation rec {
sha256 = "0mcvxd5gx3w1wzgph91l2vaiic91jmx7s01hi2igphyvd80ckyia"; sha256 = "0mcvxd5gx3w1wzgph91l2vaiic91jmx7s01hi2igphyvd80ckyia";
}; };
buildInputs = [ pkgconfig perl ]; nativeBuildInputs = [ pkgconfig perl ];
buildInputs = stdenv.lib.optional withPNG [ libpng ]; # NOT in closure anyway
postInstall = glib.flattenInclude;
meta = { meta = {
homepage = http://pixman.org; homepage = http://pixman.org;
pkgs/servers/x11/xorg/default.nix
+2
View File
@@ -7,6 +7,8 @@ let
xorg = rec { xorg = rec {
inherit pixman;
applewmproto = (stdenv.mkDerivation ((if overrides ? applewmproto then overrides.applewmproto else x: x) { applewmproto = (stdenv.mkDerivation ((if overrides ? applewmproto then overrides.applewmproto else x: x) {
name = "applewmproto-1.4.2"; name = "applewmproto-1.4.2";
builder = ./builder.sh; builder = ./builder.sh;
pkgs/top-level/all-packages.nix
+1
View File
@@ -5669,6 +5669,7 @@ let
xkeyboard_config dbus libuuid openssl gperf m4 xkeyboard_config dbus libuuid openssl gperf m4
autoconf libtool xmlto asciidoc udev flex bison python mtdev; autoconf libtool xmlto asciidoc udev flex bison python mtdev;
automake = automake110x; automake = automake110x;
pixman = pixman_cairo;
}); });
xorgReplacements = callPackage ../servers/x11/xorg/replacements.nix { }; xorgReplacements = callPackage ../servers/x11/xorg/replacements.nix { };