From 728116ec3eb04fe7c9465a240eab75e745e78d74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Wed, 6 Mar 2013 22:59:59 +0100
Subject: [PATCH] weston: don't depend on pixman explicitly.

Weston depends on cairo and pixman, but cairo uses a special version of pixman.
In the previous commit I solved a linking problem by specifying the same pixman
version for weston, but it's easier to rely on cairo propagating it. Thanks
viric for the tip!
---
 pkgs/applications/window-managers/weston/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                      | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix
index 1d442542446..2c1044d6937 100644
--- a/pkgs/applications/window-managers/weston/default.nix
+++ b/pkgs/applications/window-managers/weston/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon, pixman
+{ stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon
 , cairo, libxcb, libXcursor, x11, udev, libdrm, mtdev
 , libjpeg, pam, autoconf, automake, libtool }:
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "0g2k82pnlxl8b70ykazj7kn8xffjfsmgcgx427qdrm4083z2hgm0";
   };
 
-  buildInputs = [ pkgconfig wayland mesa libxkbcommon pixman
+  buildInputs = [ pkgconfig wayland mesa libxkbcommon
     cairo libxcb libXcursor x11 udev libdrm mtdev
     libjpeg pam autoconf automake libtool ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a9830b9f248..334c497cdec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8053,7 +8053,6 @@ let
     cairo = cairo.override {
       glSupport = true;
     };
-    pixman = pixman_cairo;
   };
 
   wings = callPackage ../applications/graphics/wings { };