Commit Graph

8 Commits

Author SHA1 Message Date
Vladimír Čunát
ac6761c908 Merge master into stdenv-updates
Conflicts:
	pkgs/applications/version-management/gource/default.nix
	pkgs/top-level/all-packages.nix
2014-01-20 19:39:28 +01:00
Bjørn Forsman
2b74a47006 gource: fix build
gource currently fails in the configure phase:

  configure: error: Could not link against -lGLU !

This is a very misleading error, it seems to happen because configure
doesn't find boost libraries and ends up with uninitialized variable(s).
That in turn cause it to fail later with this unrelated error.

Fix by using boost libraries, not only the headers. gource also grew a
dependency on GLM, so add that to buildInputs.
2014-01-18 19:05:33 +01:00
Vladimír Čunát
0a58b512cb Merge master into stdenv-updates
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
2014-01-18 14:46:20 +01:00
Peter Simons
3988e0ca51 gource: mark as broken
The configure process finds libGLU just fine, but then aborts saying:

  configure: error: Could not link against -lGLU !
2014-01-16 10:25:04 +01:00
Peter Simons
222b91fedf gource: update to version 0.40 2014-01-13 17:22:07 +01:00
Vladimír Čunát
3dd298060a gource: fix build with newer gcc versions (-fpermissive) 2014-01-05 11:22:04 +01:00
Peter Simons
01bea39bad gource: cosmetic, no functional change
svn path=/nixpkgs/trunk/; revision=31589
2012-01-16 11:33:57 +00:00
Peter Simons
3c8a798411 gource: added meta information and moved the package into version-management category
svn path=/nixpkgs/trunk/; revision=31570
2012-01-15 11:44:02 +00:00