Author: raskin
Date: 2010-06-17 15:23:38 +0000 (Thu, 17 Jun 2010)
New Revision: 22310

You can view the changes in this commit at:
   https://svn.nixos.org/viewvc/nix?rev=22310&view=rev

Modified:
   nixpkgs/trunk/pkgs/applications/networking/browsers/uzbl/default.nix
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Log:
Fix some strange Uzbl library problem

Changes:

Modified: nixpkgs/trunk/pkgs/applications/networking/browsers/uzbl/default.nix
===================================================================
--- nixpkgs/trunk/pkgs/applications/networking/browsers/uzbl/default.nix        
2010-06-17 13:09:17 UTC (rev 22309)
+++ nixpkgs/trunk/pkgs/applications/networking/browsers/uzbl/default.nix        
2010-06-17 15:23:38 UTC (rev 22310)
@@ -19,6 +19,7 @@
   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" 

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
===================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix       2010-06-17 13:09:17 UTC 
(rev 22309)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix       2010-06-17 15:23:38 UTC 
(rev 22310)
@@ -8770,6 +8770,7 @@
   uzbl = builderDefsPackage (import ../applications/networking/browsers/uzbl) {
     inherit pkgconfig webkit makeWrapper;
     inherit (gtkLibs) gtk glib;
+    inherit (xlibs) libX11;
     libsoup = gnome28.libsoup;
   };
 

_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to