From 95f5f51bae89dca29c0c33e1dd5a36237ff14a42 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 1 Dec 2007 20:05:42 +0000
Subject: [PATCH] X.Org builder: always autoPropagate buildInputs

svn path=/nixpkgs/branches/stdenv-updates/; revision=9823
---
 pkgs/servers/x11/xorg/builder.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh
index 8bde2867e10..0a145cc0a6c 100644
--- a/pkgs/servers/x11/xorg/builder.sh
+++ b/pkgs/servers/x11/xorg/builder.sh
@@ -4,11 +4,13 @@ source $stdenv/setup
 
 # After installation, automatically add all "Requires" fields in the
 # pkgconfig files (*.pc) to the propagated build inputs.
-origPostInstall=$postInstall
-postInstall=postInstall
-postInstall() {
-    if test -n "$origPostInstall"; then eval "$origPostInstall"; fi
+if test -n "$postInstall"; then
+	postInstall="$postInstall; autoPropagateBuildInputs"
+else
+	postInstall=autoPropagateBuildInputs
+fi
 
+autoPropagateBuildInputs() {
     local r p requires
     requires=$(grep "Requires:" $out/lib/pkgconfig/*.pc | \
         sed "s/Requires://" | sed "s/,/ /g")