public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updating from trunk.

Browse Source 
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
This commit is contained in:
Lluís Batlle i Rossell 2009-11-08 00:40:07 +00:00
parent 4b27d28701
commit 17876de2c5
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/browsers/uzbl/experimental.nix
View File

@ -13,7 +13,11 @@ rec {
configureFlags = []; configureFlags = [];
/* doConfigure should be removed if not needed */ /* 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*" doWrap = a.makeManyWrappers "$out/bin/uzbl*"
'' ''

4
pkgs/top-level/python-packages.nix
View File

@ -243,8 +243,8 @@ rec {
name = "pysqlite-2.5.5"; name = "pysqlite-2.5.5";
src = fetchurl { src = fetchurl {
url = "http://oss.itsystementwicklung.de/download/pysqlite/2.5/2.5.5/${name}.tar.gz"; url = "http://pysqlite.googlecode.com/files/${name}.tar.gz";
sha256 = "0kylyjzxc4kd0z3xsvs0i63163kphfh0xcc4f0d0wyck93safz7g"; sha256 = "ef7ca7f44893790e1a7084b10ea083770e138689406fddc7076d12d6bff4d44f";
}; };
# Since the `.egg' file is zipped, the `NEEDED' of the `.so' files # Since the `.egg' file is zipped, the `NEEDED' of the `.so' files