From 4462d3b9c7da343ee16272b927e8de5764bacba0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 17 Jun 2010 15:23:38 +0000
Subject: [PATCH] Fix some strange Uzbl library problem

svn path=/nixpkgs/trunk/; revision=22310
---
 pkgs/applications/networking/browsers/uzbl/default.nix | 1 +
 pkgs/top-level/all-packages.nix                        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix
index c330b685428..b5093419a26 100644
--- a/pkgs/applications/networking/browsers/uzbl/default.nix
+++ b/pkgs/applications/networking/browsers/uzbl/default.nix
@@ -19,6 +19,7 @@ rec {
   phaseNames = ["addInputs" "setVars" "doMakeInstall" "doWrap"];
 
   setVars = a.noDepEntry (''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -L${a.libX11}/lib -lX11"
   '');
 
   doWrap = a.makeManyWrappers "$out/bin/uzbl-core" 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 902cbb04825..7d4ef4b7254 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8770,6 +8770,7 @@ let
   uzbl = builderDefsPackage (import ../applications/networking/browsers/uzbl) {
     inherit pkgconfig webkit makeWrapper;
     inherit (gtkLibs) gtk glib;
+    inherit (xlibs) libX11;
     libsoup = gnome28.libsoup;
   };