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

Merge master into x-updates

Browse Source 
Conflicts (re-created on master, preserved):
	pkgs/development/compilers/llvm/3.3/more-memory-for-bugpoint.patch
This commit is contained in:
Vladimír Čunát
2014-01-23 22:49:44 +01:00
parent 29a878d1be 12235ed36e
commit 7e0b78f7b2
489 changed files with 6053 additions and 4370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/mesa/default.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, intltool, flex, bison, autoreconfHook
, python, libxml2Python, file, expat, makedepend
, libdrm, xorg, wayland, udev, llvm_34, libffi
, libdrm, xorg, wayland, udev, llvm, libffi
, libvdpau, libelf
, enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt
, enableExtraFeatures ? false # not maintained
@@ -85,7 +85,7 @@ stdenv.mkDerivation {
++ optionals stdenv.isLinux [libdrm]
;
buildInputs = with xorg; [
autoreconfHook intltool expat libxml2Python llvm_34
autoreconfHook intltool expat libxml2Python llvm
libXfixes glproto dri2proto libX11 libXext libxcb libXt
libffi wayland libvdpau libelf
] ++ optionals enableExtraFeatures [ /*libXvMC*/ ]