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 | |
| parent | b37b73a56c26d1d77acefdaf66fce580c73e3149 (diff) | |
| download | nixlib-7716b78fc7330a88e1d5bfd31158294c2f9103ae.tar nixlib-7716b78fc7330a88e1d5bfd31158294c2f9103ae.tar.gz nixlib-7716b78fc7330a88e1d5bfd31158294c2f9103ae.tar.bz2 nixlib-7716b78fc7330a88e1d5bfd31158294c2f9103ae.tar.lz nixlib-7716b78fc7330a88e1d5bfd31158294c2f9103ae.tar.xz nixlib-7716b78fc7330a88e1d5bfd31158294c2f9103ae.tar.zst nixlib-7716b78fc7330a88e1d5bfd31158294c2f9103ae.zip | |
pixman: use pixman_cairo for xorg, flatten its includes
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/pixman/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index fd12ceb9fe8a..7fbcedda3956 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; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index dc8eb85fa7ba..4e53291ebb4e 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93e5802b2907..4e31d917de48 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |