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

Some fixes

Browse Source
This commit is contained in:
Michael Raskin 2013-06-14 07:46:33 +04:00
parent 1a41887398
commit 7093dd2c70
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,12 +81,14 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig python makedepend file flex bison ]; nativeBuildInputs = [ pkgconfig python makedepend file flex bison ];
propagatedBuildInputs = with xorg; [ libdrm libXdamage libXxf86vm ]; propagatedBuildInputs = with xorg; [ libXdamage libXxf86vm ];
buildInputs = with xorg; [ buildInputs = with xorg; [
autoconf automake libtool intltool expat libxml2Python udev llvm autoconf automake libtool intltool expat libxml2Python llvm
libXfixes glproto dri2proto libX11 libXext libxcb libXt libXfixes glproto dri2proto libX11 libXext libxcb libXt
libffi wayland libffi wayland
] ++ stdenv.lib.optionals enableExtraFeatures [ /*libXvMC*/ libvdpau ]; ] ++ stdenv.lib.optionals enableExtraFeatures [ /*libXvMC*/ libvdpau ]
++ stdenv.lib.optional stdenv.isLinux [libdrm udev]
;
enableParallelBuilding = true; enableParallelBuilding = true;
doCheck = true; doCheck = true;

1
pkgs/top-level/all-packages.nix
View File

@ -4091,6 +4091,7 @@ let
cairo = callPackage ../development/libraries/cairo { cairo = callPackage ../development/libraries/cairo {
pixman = pixman_cairo; # it's recommended to be in sync pixman = pixman_cairo; # it's recommended to be in sync
glSupport = lib.elem system lib.platforms.mesaPlatforms;
}; };
pixman_cairo = callPackage ../development/libraries/pixman { }; pixman_cairo = callPackage ../development/libraries/pixman { };
cairomm = callPackage ../development/libraries/cairomm { }; cairomm = callPackage ../development/libraries/cairomm { };