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

Merge remote-tracking branch 'origin/master' into x-updates

Browse Source 
Conflicts:
	pkgs/misc/maven/maven-1.0.nix
	pkgs/os-specific/linux/xf86-input-wacom/default.nix
This commit is contained in:
Eelco Dolstra
2012-09-26 14:51:51 -04:00
parent 3aae4ccffa e710915ffc
commit d5758c99a3
793 changed files with 14306 additions and 5819 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/window-managers/awesome/default.nix
-10
View File
@@ -39,16 +39,6 @@ stdenv.mkDerivation rec {
--replace "set(AWE_MAN_LANGS it es fr de ru)" \
"set(AWE_MAN_LANGS it es fr de)"
'';
# XXX: maybe not needed anymore
# Somehow libev does not get into the rpath, although it should.
# Something may be wrong in the gcc wrapper.
preBuild = ''
export NIX_LDFLAGS_BEFORE="-lev";
'';
# Cmake fails strangely at finding lua. Looks to me like a cmake 2.8 error.
cmakeFlags = [ "-DLUA_LIBRARIES=${lua}/lib/liblua.a" ];
meta = {
homepage = http://awesome.naquadah.org/;