From d47aead668944f9d684568f1daacad2aa8b5f655 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 22 Jan 2010 18:49:16 +0000
Subject: [PATCH] Setting the difference buildInputs/buildNativeInputs in some
 gtk related packages.

svn path=/nixpkgs/branches/stdenv-updates/; revision=19620
---
 pkgs/development/libraries/atk/1.24.x.nix  | 3 ++-
 pkgs/development/libraries/glib/2.20.x.nix | 3 ++-
 pkgs/development/libraries/gtk+/2.16.x.nix | 3 ++-
 pkgs/development/libraries/gtk+/2.18.x.nix | 3 ++-
 pkgs/servers/x11/xorg/overrides.nix        | 5 +++++
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/atk/1.24.x.nix b/pkgs/development/libraries/atk/1.24.x.nix
index 1ff7f388c76d..213c3ef72a45 100644
--- a/pkgs/development/libraries/atk/1.24.x.nix
+++ b/pkgs/development/libraries/atk/1.24.x.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0mjxliarzcy7iksh6v1npxsqdpc9sjj3q4wcl567asbdzdpbd803";
   };
 
-  buildInputs = [pkgconfig perl];
+  buildNativeInputs = [perl];
+  buildInputs = [pkgconfig];
   propagatedBuildInputs = [glib];
 
   meta = {
diff --git a/pkgs/development/libraries/glib/2.20.x.nix b/pkgs/development/libraries/glib/2.20.x.nix
index 01e70c172d16..c7a92a00b42c 100644
--- a/pkgs/development/libraries/glib/2.20.x.nix
+++ b/pkgs/development/libraries/glib/2.20.x.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0ndgshcqzpj3piwmag3vrsv3rg4pnr12y70knl7z0k2i03cy5bav";
   };
 
-  buildInputs = [pkgconfig gettext perl];
+  buildNativeInputs = [perl];
+  buildInputs = [pkgconfig gettext];
 
   # The nbd package depends on a static version of this library; hence
   # the default configure flag --disable-static is switched off.
diff --git a/pkgs/development/libraries/gtk+/2.16.x.nix b/pkgs/development/libraries/gtk+/2.16.x.nix
index b9f73184087b..9abbd3aa49d2 100644
--- a/pkgs/development/libraries/gtk+/2.16.x.nix
+++ b/pkgs/development/libraries/gtk+/2.16.x.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "07gdsl3ialpwfcd0z3w108r60dn0agj12s21fpkpcx44lzknnbm3";
   };
   
-  buildInputs = [ pkgconfig perl jasper ];
+  buildNativeInputs = [ perl ];
+  buildInputs = [ pkgconfig jasper ];
   
   propagatedBuildInputs = [
     x11 glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr
diff --git a/pkgs/development/libraries/gtk+/2.18.x.nix b/pkgs/development/libraries/gtk+/2.18.x.nix
index b0d17bf45818..bb329ae8b14c 100644
--- a/pkgs/development/libraries/gtk+/2.18.x.nix
+++ b/pkgs/development/libraries/gtk+/2.18.x.nix
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
     sha256 = "0k9mz46q97537kdpmz8j5bhrzpn3zjp7k4mni4niafdp2x4r8aan";
   };
   
-  buildInputs = [ pkgconfig perl jasper ];
+  buildNativeInputs = [ perl ];
+  buildInputs = [ pkgconfig jasper ];
   
   propagatedBuildInputs =
     [ xlibs.xlibs glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr ]
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 064d73105365..4e8466f2621b 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -42,6 +42,11 @@ in
     buildNativeInputs = [ args.python ];
   };
 
+  pixman = attrs : attrs // {
+    buildInputs = [ args.pkgconfig ];
+    buildNativeInputs = [ args.perl ];
+  };
+
   libX11 = attrs: attrs // {
     preConfigure = setMalloc0ReturnsNullCrossCompiling;
   };