MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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 = [];
/* 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*"
''

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

@ -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