From 17876de2c5b763017c75cdc7527cec78765c1c56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
<viric@vicerveza.homeunix.net>
Date: Sun, 8 Nov 2009 00:40:07 +0000
Subject: [PATCH] Updating from trunk.
Many property change come, all on merge info, because those files have explicit merge info
in trunk already.
It is a problem in trunk, not in stdenv-updates. Every time we will update from trunk, the explcit merge info for these files will be updated.
svn path=/nixpkgs/branches/stdenv-updates2/; revision=18274
---
pkgs/applications/networking/browsers/uzbl/experimental.nix | 6 +++++-
pkgs/top-level/python-packages.nix | 4 ++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/networking/browsers/uzbl/experimental.nix b/pkgs/applications/networking/browsers/uzbl/experimental.nix
index e793d4731de..7d467056db8 100644
--- a/pkgs/applications/networking/browsers/uzbl/experimental.nix
+++ b/pkgs/applications/networking/browsers/uzbl/experimental.nix
@@ -13,7 +13,11 @@ rec {
configureFlags = [];
/* doConfigure should be removed if not needed */
- phaseNames = ["addInputs" "doMakeInstall" "doWrap"];
+ phaseNames = ["setVars" "addInputs" "doMakeInstall" "doWrap"];
+
+ setVars = a.noDepEntry ''
+ export NIX_LDFLAGS="$NIX_LDFLAGS -lX11"
+ '';
doWrap = a.makeManyWrappers "$out/bin/uzbl*"
''
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4ee6fec488d..2c83521c846 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -243,8 +243,8 @@ rec {
name = "pysqlite-2.5.5";
src = fetchurl {
- url = "http://oss.itsystementwicklung.de/download/pysqlite/2.5/2.5.5/${name}.tar.gz";
- sha256 = "0kylyjzxc4kd0z3xsvs0i63163kphfh0xcc4f0d0wyck93safz7g";
+ url = "http://pysqlite.googlecode.com/files/${name}.tar.gz";
+ sha256 = "ef7ca7f44893790e1a7084b10ea083770e138689406fddc7076d12d6bff4d44f";
};
# Since the `.egg' file is zipped, the `NEEDED' of the `.so' files